From patchwork Sun Nov 10 04:07:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16190 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 4043B449E60 for ; Sun, 10 Nov 2019 06:13:09 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1D512689D3A; Sun, 10 Nov 2019 06:13:09 +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 2DE18689AA2 for ; Sun, 10 Nov 2019 06:13:03 +0200 (EET) Received: by mail-wr1-f65.google.com with SMTP id p4so11112214wrm.8 for ; Sat, 09 Nov 2019 20:13:03 -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=cTtyGnTuA/AGgmmUGVw4saJEhbnl3bSFdzysv8DPAac=; b=ZoVjCACPe14bpXv+cTVXh+7K2oFXJ/faXTw6HNJ7hFaX3Rv5C4jfXO4tPVgEtVW+Rt EJTyHzG3ZPg/bwXmSEkulSAP9m5WQMrPtD8hvr3mLBKq7++9XU9k0fbUOrlRZni+neWf Y1lyD31zNjanL7zlAFlJ/tFtQ0rfrrPBL2uWkMMTagQBcZw09S/C2UodgBWnTqhDN8sN okefQpuCmTyvtsesEpb1QUPwGUxCXGmuyyTGL6uqIYG+m2CbaN8hvL8tuOuyTdrp7mbP MWqdchB1UTiCZbzW6/5suaGyiKHrJQdyYcCgxUiZqHY4owujVI4Q+jnWDonAN7JxWVa/ c8TA== 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=cTtyGnTuA/AGgmmUGVw4saJEhbnl3bSFdzysv8DPAac=; b=cFOlt52R/Q5Bl+Dmiut8AyCoaoAw0gXrEGGTFXL24Fn407l5K7kx3FeaEt6n95HI1H wMVGL9IBymvV2rZBEJWg/2FUt+cxGpkwvpLLgD+cbVZW/vlDxGp9wuuv06PTI2uJrUw/ q02g8xYyHxJLerYGepPi5hZNY4TTTssAdefi4Y/I5LWHAqIBBNx04yf22fSvfHtyuTXs LbyC0BIGkwRI5pxztv846A+co4DXJCd/TteLmXmN6AKFbEoVmeXhImoGSg8AAETCkloH bIPF498U9iEeZmodPYXl0NKSDqTR3qfXgCy6Ck1M84qHuf1zMAZf9+eyhodkGEgehr3T Ii5Q== X-Gm-Message-State: APjAAAXK20Li2lqNUGPgtGw0aky1IjKdmnxq+6OmGPhwfxxWCunvSNw+ dMCLQ/JmMOxfwJNnau1ir5LX0l9h X-Google-Smtp-Source: APXvYqwGnmoE7aKzIvftzySyb6q0U66yvFZ1uYc5qVZ/pg9BqA2dScsRZw+0LOpk2nNvS6lggpFLLQ== X-Received: by 2002:a5d:638a:: with SMTP id p10mr12036426wru.336.1573358867642; Sat, 09 Nov 2019 20:07:47 -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.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 20:07:47 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 05:07:33 +0100 Message-Id: <20191110040733.11755-6-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 7/7] avformat/mov: 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 1452574 and 1452565, 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/mov.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/mov.c b/libavformat/mov.c index d5c67fbc68..df010c68ac 100644 --- a/libavformat/mov.c +++ b/libavformat/mov.c @@ -1129,8 +1129,8 @@ static int mov_read_ftyp(MOVContext *c, AVIOContext *pb, MOVAtom atom) return ret; } comp_brands_str[comp_brand_size] = 0; - av_dict_set(&c->fc->metadata, "compatible_brands", comp_brands_str, 0); - av_freep(&comp_brands_str); + av_dict_set(&c->fc->metadata, "compatible_brands", + comp_brands_str, AV_DICT_DONT_STRDUP_VAL); return 0; } @@ -5801,8 +5801,8 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom) return AVERROR_INVALIDDATA; } buffer[len] = '\0'; - av_dict_set(&c->fc->metadata, "xmp", buffer, 0); - av_free(buffer); + av_dict_set(&c->fc->metadata, "xmp", + buffer, AV_DICT_DONT_STRDUP_VAL); } else { // skip all uuid atom, which makes it fast for long uuid-xmp file ret = avio_skip(pb, len);