From patchwork Sat Aug 8 14:02:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 21544 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 8113344927A for ; Sat, 8 Aug 2020 17:10:23 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 631E168B970; Sat, 8 Aug 2020 17:10:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ed1-f65.google.com (mail-ed1-f65.google.com [209.85.208.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 48FA068B96E for ; Sat, 8 Aug 2020 17:10:17 +0300 (EEST) Received: by mail-ed1-f65.google.com with SMTP id q4so3240768edv.13 for ; Sat, 08 Aug 2020 07:10:17 -0700 (PDT) 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=yiOLuoMh0HI5/n3GDm+wtBtKjtkcoEsiKdvOCQTVkG8=; b=QGqC5y3lUXjqxA+BDzVewxKpsuqAx5KN4QHf8clJM0OjjtWRD+C1GeKe+txtZzePTE +IbGhg/maZMt/qitIRmgiwuNmIBRi50Zhv1EBpxKTfPMQDn335IYpIsYb9O1FYQ4hMnz I4hNSosjVNempSCEFnsWwgNyWxOyJ8MYDc+ipJXadoWeKHSYHyuc28ixYxUbzKW8KVcr 5bMOgEh63iOZKCDVLwhaFEa+QvRpNvc7sb1gYGFFQwIcx0Y3jUpBHhU7e5UOva0Et8qV tPPztC5Le5Ie2V5drO5QpqgEFIRD25QSwPkgU8ZGbsJEsksYQSm6o8I5sbmaAogwVkhM WD/w== 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=yiOLuoMh0HI5/n3GDm+wtBtKjtkcoEsiKdvOCQTVkG8=; b=QP8bbuVupj4J6eyN/QqczrUTNFeZApZ8Qeg1WxnNwnO8ezQNsaBOIxif75AbW1lnDF sYLjO0Vh8Gn8w/P3QME4UG3jHDN/FzOuwveOSxfuxIzPs1KBQWUtFF9cSufpG9cxnduo GXv2ZaCGcbPLt4rZprpxgal0pHwimoHN0xW5XuypWZr13GnttDXj3p56ichSSIwc32za aS7+MAyyGly4cdPPRm9ay2DSfr4RlZWWzq2GMNgb6MVfxoXtiuu5qlhLSeHAzCbr7OMd qEElNwb3C6evasiYMbFnWvV9B+NKJlJ6MasyG9sLweKlOn232QwnIQbgiPqsWkQg3zm2 +NLw== X-Gm-Message-State: AOAM532LdIIe4ViJ9xWN5zMQcFBxN9gpPXz4U7WpSJE5gTqJB8tmddJa C0Lnm75vYcZYD9QfI/BY9fbbNTbe X-Google-Smtp-Source: ABdhPJymc0DjkofTOm2Hh/MNab5JwXBu6FQqRyeX4VwqNatygkIiebkD26Jd/7w59YNrA23g+tSNlA== X-Received: by 2002:a50:fc82:: with SMTP id f2mr13259237edq.53.1596895816465; Sat, 08 Aug 2020 07:10:16 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc10296.dynamic.kabel-deutschland.de. [188.193.2.150]) by smtp.gmail.com with ESMTPSA id g21sm7618991edm.65.2020.08.08.07.10.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 08 Aug 2020 07:10:15 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Sat, 8 Aug 2020 16:02:03 +0200 Message-Id: <20200808140202.586-6-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200808140202.586-1-andreas.rheinhardt@gmail.com> References: <20200808140202.586-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/6] Revert "lavfi/avfiltergraph: add check before free the format" 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 reverts commit f156f4ab2317f22bfef33c7eaead0d5d5f162903. The checks added by said commit are nonsense because they did not help in case ff_merge_samplerates() or ff_merge_formats() returned NULL while freeing one of its arguments: Said freeing does not change the local variables of can_merge_formats(). Signed-off-by: Andreas Rheinhardt --- libavfilter/avfiltergraph.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 2fe4f0b0f9..a149f8fb6d 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -419,10 +419,8 @@ static int can_merge_formats(AVFilterFormats *a_arg, av_freep(&ret); return 1; } else { - if (a) - av_freep(&a->formats); - if (b) - av_freep(&b->formats); + av_freep(&a->formats); + av_freep(&b->formats); av_freep(&a); av_freep(&b); return 0;