From patchwork Sun Nov 10 04:07:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 16191 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 73DEA44A107 for ; Sun, 10 Nov 2019 06:14:23 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D16D689F91; Sun, 10 Nov 2019 06:14:23 +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 6CA6D689992 for ; Sun, 10 Nov 2019 06:14:17 +0200 (EET) Received: by mail-wr1-f68.google.com with SMTP id a11so11142587wra.6 for ; Sat, 09 Nov 2019 20:14:17 -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=JaxSrPZRkvfFIKy3/Qn7v9cLNWKQP0ZNtTXdCXjuX/Q=; b=DYlki90M9GTDpWWAhWKfZOoAytgdphVGkDj8KaBu8g8pW5ka/U0H25vGwBkNRDgnki lXTXqcwsxqSKAgoosoqdJfoaAY9BWexW3sfhy0mygd7QHEYSM0XFsjaQ62te1d35Fcp5 xGcYWDGluJOFe0VPwrtrYr7jt2PXXZyThJFSjrt3XwhN1eyRkGD78RMkkniRUwt+uZOD 6S9hQqUZJlMh1vGgc1mfssFzO2Apvq56EvUG7ypLP3SErdesoWpQrU5KnMbWVFCO1fRN UZTnQIq1D2FTU/nTOaCQuJKEsrWRQhCzqukrvr8qRPkdp8fxJPDpPBRhgsZbc6LPPqQQ JVCg== 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=JaxSrPZRkvfFIKy3/Qn7v9cLNWKQP0ZNtTXdCXjuX/Q=; b=XpcA5DUZubDoGRhF0JAQhkyvAU2dcgsvL7dAYN/nEbAkFLIl+RBNeCVQK2000Ii4So 87WQwFClA4RfIyuFMfwAnwrz3EZ4H4wm5kkVNRDMsMe/b3Ns9UtAFPZBkISgvskyghfZ VSiZ3zAYvVtkrAGFcZkl2FP5jzV+UGZ4yOr31iOCJBeFicKuVPvvNrmbjjWZLZGu//Ha uwASG5Ca0QWO2ncmscSdyPQyZTVAKmAckJWOw/2KMNAtPe1gV8/7fbCvM5wxVURMyrM4 W3WmKyImQi33ZoRvoFP4P6fRDNSmsBagDo2s5q76BaE+I4DRmfK8RBxNTsGncaAfpsqP NYSA== X-Gm-Message-State: APjAAAUln47EGIdhRNGl33sir/mr2yS4dT3TsNgzHTsApVQPigqUIZY7 Qx8fP3pyieP8mtY/IKXEpf3bFHsK X-Google-Smtp-Source: APXvYqxiuh7lIM+QZGvy+pFA1uCklHFLfdTUwsFfSvYwZ9oV6Bp7bjAWDF9Zhy/2wwVaM0Z4Hly52A== X-Received: by 2002:a5d:444a:: with SMTP id x10mr8170542wrr.228.1573358863166; Sat, 09 Nov 2019 20:07:43 -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.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 09 Nov 2019 20:07:42 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sun, 10 Nov 2019 05:07:28 +0100 Message-Id: <20191110040733.11755-1-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 2/7] avformat/id3v2: Fix double-free on error 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" ff_id3v2_parse_priv_dict() uses av_dict_set() with the flags AV_DICT_DONT_STRDUP_KEY and AV_DICT_DONT_STRDUP_VAL. In this case both key and value are freed on error (and owned by the destination dictionary on success), so that freeing them again on error is a double-free and therefore forbidden. But it nevertheless happened. Fixes CID 1452489 and 1452421. Signed-off-by: Andreas Rheinhardt --- libavformat/id3v2.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/libavformat/id3v2.c b/libavformat/id3v2.c index b43ab1745f..e9843eef9a 100644 --- a/libavformat/id3v2.c +++ b/libavformat/id3v2.c @@ -1263,8 +1263,6 @@ int ff_id3v2_parse_priv_dict(AVDictionary **metadata, ID3v2ExtraMeta **extra_met } if ((ret = av_dict_set(metadata, key, escaped, dict_flags)) < 0) { - av_free(key); - av_free(escaped); return ret; } }