From patchwork Sun Nov 10 04:07:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16194 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 7ED2B44A459 for ; Sun, 10 Nov 2019 06:15:33 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 68E15689F63; Sun, 10 Nov 2019 06:15:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 637BE68980E for ; Sun, 10 Nov 2019 06:15:26 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id p4so11114106wrm.8 for ; Sat, 09 Nov 2019 20:15:26 -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=25PFUVvSWw1gxFxnZ8vVrJGxzp4ldWLOMwRNBqEml60=; b=bGyF/Y9Vq19Z7Pc5gJ+bZeEVEmRZ/hbDD97sqbTdBD4jdkOEVmgTdJyNW8p8N5Tk7j x4pwOq9hPQPIwE51rY8qc6gEkIapb1LtKmIbaR5AkDXh85VVCxOxpImEs/FDuu9LXBK9 z//jcWLrNwO24F64uRtsHriVdxetfXIpJd6mzKb7Cbmr5t3L6yvzlnVtFe1SZ5CbwAf/ /1WW70xaPnZm4G/KjRicKRSOj1RZBnK2bG854nhknwKHnX38mJNKfC7sbhCQA2ew8waN YGvCCS2m/NO77El33+zsOdBhI81dRXuGY47iefGPOLFC0CnGnVxSG9NT2ZVAv4cXehid 8hLA== 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=25PFUVvSWw1gxFxnZ8vVrJGxzp4ldWLOMwRNBqEml60=; b=jLRJLiCpxilSyqEUzBAAFpq3NEqTLHP/XA95a7BNJlivx+JlWjDsJve2+pnp957VkD uk0IaodLyxfdIcEI37c4rYykt9akS8m8O1ZDLwjS+/s/F1ES7BxvfAtsonjsqgbNFcow IyRfAPzmsVolJnY2BoOSwLmKJNiazrkezSjUXgxHfsfwhD4PwBHXyNRYgRKAwco7+03/ xEZCvn3xrWOcRHff70D2uKfRbuItvlhKt80zkNn59gI/56xpj8LTuax3AgASf0ZlhcTl Wd6WN3pR70oV+C1MB14J4gsrYxSyYnjxedP29M4CcDuAVKSn8xajBSYMZ6JNtx1Q4iMF EYAg== X-Gm-Message-State: APjAAAV2T99+OW+EHO1WpIlY0QXWPlkn2Nx++IDtUiR5Luy7OxYhRyX9 ZzDZCiub+TuIYXkAK5iQhjZKTCEn X-Google-Smtp-Source: APXvYqyD34dq3czCxUOXy1nF+0amMEyGktViAjWwPGDI0hx1JaHlir2QZa1Md4ZE5LRTLfwu2ZKZng== X-Received: by 2002:adf:e542:: with SMTP id z2mr13923952wrm.338.1573358866750; Sat, 09 Nov 2019 20:07:46 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id q15sm11381781wrr.82.2019.11.09.20.07.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 20:07:46 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 05:07:32 +0100 Message-Id: <20191110040733.11755-5-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 6/7] avformat/wtvdec: 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 1452571, a false positive 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/wtvdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c index 706e8ca38d..3960e6ae2f 100644 --- a/libavformat/wtvdec.c +++ b/libavformat/wtvdec.c @@ -525,8 +525,7 @@ static void get_tag(AVFormatContext *s, AVIOContext *pb, const char *key, int ty return; } - av_dict_set(&s->metadata, key, buf, 0); - av_freep(&buf); + av_dict_set(&s->metadata, key, buf, AV_DICT_DONT_STRDUP_VAL); } /**