From patchwork Mon Nov 11 01:12:59 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16202 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 7FFEA44828C for ; Mon, 11 Nov 2019 03:13:19 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BA3068ABB5; Mon, 11 Nov 2019 03:13:19 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 574A16883D3 for ; Mon, 11 Nov 2019 03:13:12 +0200 (EET) Received: by mail-wr1-f67.google.com with SMTP id s5so1709276wrw.2 for ; Sun, 10 Nov 2019 17:13:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gKXALCfir2+G9c2VcxqvK/hw+Dd0ALzxsdslcTer2Co=; b=cY47+tEC5mzVpRbm/cwY1pyDQj5NY3xstyTttzFmZMeylcg+kpAqAVYrxdTWQ1F56l 3OsiNzjDvvSAjDSqPQQQn4KIdqxWAl0UNdRgIBlIm97PtjoZPSWkQjOz1RwJodxtMOeD jopWp17pRQepw9JrZDdGfAJL6oFbHJp8nn8ulmqdHI6jRfGW5hVdAl37gfCkKqroDpHh XDWLdIDfCheJzntaSIFoU6Qo40aDqlUhU6AcTDO0B60zxYrLD69HBnN8tGCl0QPWS05N GYWARGBUjV3z5ySRquqllSZytnNlVnj7OMibULAa9plF7pBRD+Pj47gDTM52+qDh1vfE GowA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gKXALCfir2+G9c2VcxqvK/hw+Dd0ALzxsdslcTer2Co=; b=ITnzNWIfRjRJJjq7gBqwhqOp8qOhJ9Pct0Ge69Svr8ztPgQ08ZFbVtMWKyGGb2ReR2 rAKWpVIoo0a0Dya5VCHXlLF9lIDGiYAHGbRoYoKH94iarRCj0xjV10IUtVujYQJkNmeF +RTkGZCs4e05p1WTgRx8rI1Gaf4+wzcsNQTJNpgbnjtLyQqwwKvRlG0EXBwRWBcAfcXG TOWaICidRZ67epX0YzKcMXylQHeecDX/5k2Znkj/ssQal2uozbdEWKEEauBHBPrG6LRI RZgEB5XImfsS38GafbwXlYqPvT513spCQJEGCsb3y9BNtqyMgbdTiaHw8Pywmr4SM19H Zh4Q== X-Gm-Message-State: APjAAAXiF1h4rntNMSUsz36nL73htI5iwWJBKohID0X4+pCbCECsiZgh D9V+FT0n1cLjqfacJxvw87NTgnXz X-Google-Smtp-Source: APXvYqx11QcEPmrzuIx7gJ252nodkdGj61DD9f7635Ke/UFEicgqthGw145f78HEy1QWIXIik/rMVg== X-Received: by 2002:adf:b1cb:: with SMTP id r11mr11710987wra.246.1573434791756; Sun, 10 Nov 2019 17:13:11 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id c24sm33717357wrb.27.2019.11.10.17.13.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2019 17:13:11 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 11 Nov 2019 02:12:59 +0100 Message-Id: <20191111011259.27313-3-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191110035406.11500-1-andreas.rheinhardt@gmail.com> References: <20191110035406.11500-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/11] avformat/mpegts: Use AV_DICT_DONT_STRDUP_VAL to avoid av_strdup X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This will likely also fix CID 1452589 and 1452460, false positives resulting from Coverity thinking that av_dict_set() automatically frees its key and value parameters (even without the AV_DICT_DONT_STRDUP_* flags). Signed-off-by: Andreas Rheinhardt --- libavformat/mpegts.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c index 587ed33327..e0f3a5eab9 100644 --- a/libavformat/mpegts.c +++ b/libavformat/mpegts.c @@ -2611,6 +2611,7 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len desc_tag, desc_len); switch (desc_tag) { + AVProgram *program; case 0x48: service_type = get8(&p, p_end); if (service_type < 0) @@ -2619,16 +2620,15 @@ static void sdt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len if (!provider_name) break; name = getstr8(&p, p_end); - if (name) { - AVProgram *program = av_new_program(ts->stream, sid); - if (program) { - av_dict_set(&program->metadata, "service_name", name, 0); - av_dict_set(&program->metadata, "service_provider", - provider_name, 0); - } + if (name && (program = av_new_program(ts->stream, sid))) { + av_dict_set(&program->metadata, "service_name", + name, AV_DICT_DONT_STRDUP_VAL); + av_dict_set(&program->metadata, "service_provider", + provider_name, AV_DICT_DONT_STRDUP_VAL); + } else { + av_free(name); + av_free(provider_name); } - av_free(name); - av_free(provider_name); break; default: break;