From patchwork Wed Oct 8 12:09:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 26369 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1Xbq4P-0000Y0-W4; Wed, 08 Oct 2014 14:10:18 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-8) with esmtp id 1Xbq4O-0002eN-jC; Wed, 08 Oct 2014 14:10:17 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756271AbaJHMKN (ORCPT + 1 other); Wed, 8 Oct 2014 08:10:13 -0400 Received: from mail-pa0-f54.google.com ([209.85.220.54]:62860 "EHLO mail-pa0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755174AbaJHMKM (ORCPT ); Wed, 8 Oct 2014 08:10:12 -0400 Received: by mail-pa0-f54.google.com with SMTP id ey11so9044071pad.13 for ; Wed, 08 Oct 2014 05:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gOpVLTNj2shmALP5WDXebY/3S8y/R9uhtNgG2AzrQzo=; b=WbDAuecMaDee4CXRqADZdIOS3pLcW1ECSqdbUjBwlO88tXyvXYPQ7ftNFdLrW9hwDU pu5XOONQnIzPFPeEXykbLV0ja3jvRW423UsZbZZSyPSfRC4xGdrd1ViB97LBVNscY8hU ji2DC5A7kQEKalJAzAK7v4GshSNVxLkpC751IKrlCgGzyMSgWBOMQj2cYmwJ3kBATr0r 9G2qMukc/i2IfGQ1J+VKrGO7j232pmSzn1yALeMoTNHUQl1hwLlTEIWeQ+U0bWdcCr4C bJ/BMEgYY1gorUrrZCOqpoyvly1qd7V1/LG9dkVdeIJ8SBQMhs7tMKkp9ighMxkkaFdV v4kw== X-Received: by 10.70.87.233 with SMTP id bb9mr10289882pdb.89.1412770212076; Wed, 08 Oct 2014 05:10:12 -0700 (PDT) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id g1sm16426666pdh.12.2014.10.08.05.10.09 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 08 Oct 2014 05:10:11 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com Subject: [PATCH 1/4] v4l-utils/libdvbv5: avoid crash when failed to get a channel name Date: Wed, 8 Oct 2014 21:09:38 +0900 Message-Id: <1412770181-5420-2-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1412770181-5420-1-git-send-email-tskd08@gmail.com> References: <1412770181-5420-1-git-send-email-tskd08@gmail.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2014.10.8.115724 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, NO_REAL_NAME 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __IN_REP_TO 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __STOCK_PHRASE_7 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' From: Akihiro Tsukada Signed-off-by: Akihiro Tsukada --- lib/libdvbv5/dvb-file.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c index 27d9a63..bcb1762 100644 --- a/lib/libdvbv5/dvb-file.c +++ b/lib/libdvbv5/dvb-file.c @@ -1121,20 +1121,21 @@ static int get_program_and_store(struct dvb_v5_fe_parms_priv *parms, if (rc) dvb_logerr("Couldn't get frontend props"); } - if (!*channel) { - r = asprintf(&channel, "%.2fMHz#%d", freq/1000000., service_id); - if (r < 0) - dvb_perror("asprintf"); - if (parms->p.verbose) - dvb_log("Storing as: '%s'", channel); - } for (j = 0; j < parms->n_props; j++) { entry->props[j].cmd = parms->dvb_prop[j].cmd; entry->props[j].u.data = parms->dvb_prop[j].u.data; - if (!*channel && entry->props[j].cmd == DTV_FREQUENCY) + if ((!channel || !*channel) && + entry->props[j].cmd == DTV_FREQUENCY) freq = parms->dvb_prop[j].u.data; } + if (!channel || !*channel) { + r = asprintf(&channel, "%.2fMHz#%d", freq/1000000., service_id); + if (r < 0) + dvb_perror("asprintf"); + if (parms->p.verbose) + dvb_log("Storing as: '%s'", channel); + } entry->n_props = parms->n_props; entry->channel = channel;