From patchwork Sun Oct 26 11:46:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiro TSUKADA X-Patchwork-Id: 26570 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1XiMI3-00018H-Ex; Sun, 26 Oct 2014 12:47:19 +0100 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-5) with esmtp id 1XiMI1-0006eS-85; Sun, 26 Oct 2014 12:47:19 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751536AbaJZLrP (ORCPT + 1 other); Sun, 26 Oct 2014 07:47:15 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:58333 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751523AbaJZLrO (ORCPT ); Sun, 26 Oct 2014 07:47:14 -0400 Received: by mail-pa0-f46.google.com with SMTP id lf10so2061444pab.5 for ; Sun, 26 Oct 2014 04:47:14 -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=XRKytyCLD207Ay21XO2vb3b2g0kHlobO7ruum6JOHfU=; b=GrS4XT78XXvzxgBxcvS8MVB1Y97FaP4EdIUWUSRXZFZNqsR8yQob1w5JAXX63C3iP1 bo0K5EgTgaz+X4moXoB+HTGrNSMEEGdq1DT974ozuuDiNGHqbTuVN0LiE7AKnVFKYJWZ m99LPRASzIKtrzbZvbm77th29JquY8y2mFuPMmtZWk9yxZJh2D2oQXUfK9P7Qqmoxmkc sdkcIHncencUIktmhnpjQgj2CEN4hS6hT7J1bHAnA3Iin/HtMa9MQd4ZCS7aJFgUgL9A xUM6XobDFqMZz7N/4f2fLY7KNyVICqWMuuYYmqHk9VEkwfotG3krhW81qamYZe1VF9dh 0aXw== X-Received: by 10.68.110.161 with SMTP id ib1mr16812611pbb.109.1414324034278; Sun, 26 Oct 2014 04:47:14 -0700 (PDT) Received: from seabird.localdomain.localdomain (softbank219203027033.bbtec.net. [219.203.27.33]) by mx.google.com with ESMTPSA id dp4sm8203581pbc.21.2014.10.26.04.47.11 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 26 Oct 2014 04:47:13 -0700 (PDT) From: tskd08@gmail.com To: linux-media@vger.kernel.org Cc: m.chehab@samsung.com, Akihiro Tsukada Subject: [PATCH v2 1/7] v4l-utils/libdvbv5: fix auto generation of channel names Date: Sun, 26 Oct 2014 20:46:17 +0900 Message-Id: <1414323983-15996-2-git-send-email-tskd08@gmail.com> X-Mailer: git-send-email 2.1.2 In-Reply-To: <1414323983-15996-1-git-send-email-tskd08@gmail.com> References: <1414323983-15996-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.26.113620 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 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, __MULTIPLE_RCPTS_CC_X2 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 when channel name was not available, it was generated from unset variables, and leaked memory. --- lib/libdvbv5/dvb-file.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/lib/libdvbv5/dvb-file.c b/lib/libdvbv5/dvb-file.c index 27d9a63..1ea14c4 100644 --- a/lib/libdvbv5/dvb-file.c +++ b/lib/libdvbv5/dvb-file.c @@ -1121,20 +1121,23 @@ static int get_program_and_store(struct dvb_v5_fe_parms_priv *parms, if (rc) dvb_logerr("Couldn't get frontend props"); } + 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) + freq = entry->props[j].u.data; + } if (!*channel) { - r = asprintf(&channel, "%.2fMHz#%d", freq/1000000., service_id); + free(channel); + r = asprintf(&channel, "%.2f%cHz#%d", freq / 1000000., + dvb_fe_is_satellite(parms->p.current_sys) ? 'G' : 'M', + 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) - freq = parms->dvb_prop[j].u.data; - } entry->n_props = parms->n_props; entry->channel = channel; @@ -1225,12 +1228,19 @@ int dvb_store_channel(struct dvb_file **dvb_file, continue; service_id = dvb_scan_handler->program[i].pat_pgm->service_id; + rc = asprintf(&channel, "#%d", service_id); + if (rc < 0) { + dvb_perror("asprintf"); + return rc; + } rc = get_program_and_store(parms, *dvb_file, dvb_scan_handler, service_id, channel, NULL, get_detected, get_nit); - if (rc < 0) + if (rc < 0) { + free(channel); return rc; + } } return 0;