From patchwork Sun Nov 10 04:07:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16192 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 8B72644A107 for ; Sun, 10 Nov 2019 06:14:53 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 77C1668A6E1; Sun, 10 Nov 2019 06:14:53 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2DDDF689E84 for ; Sun, 10 Nov 2019 06:14:47 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id i10so11124084wrs.7 for ; Sat, 09 Nov 2019 20:14:47 -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=ICSa2XYa64zILV+L07GchcgCvgE/X7lLhkKwYIOe71k=; b=MMND5MTHHYfhPkILx3VMIDxDJ+iazExJHmWQY7FRV+eO/d0M/fk653Iu6LjOj1o6Hq OgMNKbC1ZLs5Xy11QEnjx/YZbA2uJCiXaFNgkTB07Wp7lFKCRqTQHt6Lv3vLULBr8DS5 FimPLfu9tsxiXoihkflLZ6Ln4ozHf6un88e9Em3pLQ0buQpNnFg5aokg5gWcsde9NuYC 3/SVkO/M4VXxz1mZVaOjsT531yX6Z9sDVw+NHalvtQoMO09rfla3JegtT3t0SAE+FiLK dyO1P0zLdGwPQJWYikh0OTvlJijfZUSYZCMTuDxS/6WK6JjjhCTmOr7bgyyLm9aJsd5/ 5RHg== 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=ICSa2XYa64zILV+L07GchcgCvgE/X7lLhkKwYIOe71k=; b=thSCa1y8dBna0XM6Y7U6OIjiqTQz8dpqUzgijlN7pm74uZH+EUsvztZuDDbnF3c0EB AFEjABIEX1WplfoDbBeW1vIxOAVSGNi+EDgHm4gDQNEGbFm461pT8Wj2rEQkpgU/Hppd Qlj7ig3bqXuPhDSRzOG/btZFgApfs9hdaTj+bNOIUuA6KaZft2Kpgss/hgoAHXlypCTH xQfRUisAeW8LDyFH3kLH+OJgt1EznSQMMZCEPYQswMTRoYJlW/epUDBKUqURyCWakB7U /c+GoWYOIf6q1IebRMx94MYGvCsBpjBMH5wSipNLu7x/9mSsZFfFp7TJOd6QI1ojkpo8 w2Nw== X-Gm-Message-State: APjAAAW+QaNbOvg2Bb7dVWQi9oQBWMAItGe/YhFJRsRUb/FL9MzIMuTS c8OzfiFxYvcAKxPj/oIKCtyFr1h0 X-Google-Smtp-Source: APXvYqyEUoY8tPgE4vc7CMHq9TIgDu/uxmwntUmWpqVpJExelxGqMMO3+mdETHqDZSDSLyVhvE8log== X-Received: by 2002:a5d:5444:: with SMTP id w4mr14775033wrv.164.1573358865884; Sat, 09 Nov 2019 20:07:45 -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:45 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 05:07:31 +0100 Message-Id: <20191110040733.11755-4-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 5/7] avformat/matroskadec: Use AV_DICT_DONT_STRDUP_VAL to save 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 1452562, 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/matroskadec.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c index c224c3447a..56863eb08e 100644 --- a/libavformat/matroskadec.c +++ b/libavformat/matroskadec.c @@ -2413,8 +2413,8 @@ static int matroska_parse_tracks(AVFormatContext *s) if (key_id_base64) { /* export encryption key id as base64 metadata tag */ - av_dict_set(&st->metadata, "enc_key_id", key_id_base64, 0); - av_freep(&key_id_base64); + av_dict_set(&st->metadata, "enc_key_id", key_id_base64, + AV_DICT_DONT_STRDUP_VAL); } if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC") && @@ -4142,8 +4142,8 @@ static int webm_dash_manifest_cues(AVFormatContext *s, int64_t init_range) } end += ret; } - av_dict_set(&s->streams[0]->metadata, CUE_TIMESTAMPS, buf, 0); - av_free(buf); + av_dict_set(&s->streams[0]->metadata, CUE_TIMESTAMPS, + buf, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -4168,8 +4168,8 @@ static int webm_dash_manifest_read_header(AVFormatContext *s) if (!matroska->is_live) { buf = av_asprintf("%g", matroska->duration); if (!buf) return AVERROR(ENOMEM); - av_dict_set(&s->streams[0]->metadata, DURATION, buf, 0); - av_free(buf); + av_dict_set(&s->streams[0]->metadata, DURATION, + buf, AV_DICT_DONT_STRDUP_VAL); // initialization range // 5 is the offset of Cluster ID.