From patchwork Mon Jun 10 19:09:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 49781 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp2737078vqo; Mon, 10 Jun 2024 12:10:26 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXO7mhcvblDp8QWwCc2F9IzLN4Pn9rVXzslynKqOs+LQNv92E9DClTN99WWU9RqJCPXM+a5+YDfSEw3qenGFh+M4ztuPTcOABsz6A== X-Google-Smtp-Source: AGHT+IEO3qilRQxg6wZP9cBOxFl6DYq1oDJvLgp7HRmiMxgwt63+GCJ/AMdiKb5yxFUObdOlqBiZ X-Received: by 2002:a17:906:b07:b0:a6e:f419:5456 with SMTP id a640c23a62f3a-a6ef4195592mr483420766b.6.1718046626277; Mon, 10 Jun 2024 12:10:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1718046626; cv=none; d=google.com; s=arc-20160816; b=QZNstzJ9HwsM9Ce1q/oXJ3AQXR5vhmFweT8TRtehQR1TxAqonyXHE4u8wBQUIsAM0L zI3CcTvFc5JPX+h1wKGA10TNqifKc3LV0JH+nwnhYBwKm37knikFWWd/5lQO4Lf2X7oX jkfgotapAvbkFvSoqEWSzjQnjs4AYDqhhofqdkl3QH/YmX6ZgSaLysP+c0+qGeP+itQi nkv2bWAkZzlggg/tdyxjICrQvxIc3oMUaujPMdds/MRVPEmBJq+o7WqgvARfOTAQ8IOm YlscgSJ5gRTEjfuLzNLWM9lX+ZBoWINirg4lNwlaaa83z1DAO0Ybe+crGeHzyJLuL2CS EN5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=+Sy/ic6uU/V6AFyLpMYQ8WMJ9KMdqm+ONpkI8NN+DYs=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=OnipPM0/9KuiQYlx8EWwDzHgihWGNP1xnajNFJ+dcM/y2NkJNHNppFMm70t6X1vbBs QoyoL0feyudxtR/GHjBk7Th7dg39DRMeswZk73COQ10QVenj+jLJgv+nYUQhja9QprU1 G9xJIl8R7HttSVatjNW9fv6fBtZ7ieFq7Ij6pH4QZ7PpuhkmLMQzjyCJsQHhDIYwrMKZ 98zQlPu73tZYG7E8OwUaHog7pFC851C6x9KdX1RMjm8IKOGSk3pgf+4ekU5SVpbL/t16 IlRo3mAvjQR02+sY6eE2yHPlDA71517MulUb77vkIPdR/ovu0dWSc4M9DXeJ2XUFIKyb O2Vw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=PRyqUTF+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a6f1951ebf6si172050666b.514.2024.06.10.12.10.25; Mon, 10 Jun 2024 12:10:26 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=PRyqUTF+; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BDE2568D7D6; Mon, 10 Jun 2024 22:10:08 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay8-d.mail.gandi.net (relay8-d.mail.gandi.net [217.70.183.201]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6116968D7AE for ; Mon, 10 Jun 2024 22:10:00 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 904721BF204 for ; Mon, 10 Jun 2024 19:09:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1718046599; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=yXGE6XPURa+3pB3b5y7OzVm4gvcwZIU4jnOwpzHL0TE=; b=PRyqUTF+1ofDru+yAzW/Y/t47fiXanyf88WqoyvPqyqWN/GnYuojuyKstA/wIWwlG00vyE 5f2p7rG8mK9PLzZmbKtPpCxWzygmeq1O9+nUrL76nfaJjMuab0rRBBx60MUveyXqtQW0dI MGR19eGoPcbDeodzJjJYJatRQc04U/JXJLTZgdMk0lLV3rAWk1xmSoB4+WAfTK+GcmLRfz S9C1TUDRN8le9lwQS8yv5ndeg7sj1lXLjyXI0knZhkA920hscfMasXZObow57T+20iWn2R nfkd1To1qtu+ivVwcGG0YN5OC3P18OfMloNpUPBFpCXxt1Ay0wT5XoBp0dPscg== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 10 Jun 2024 21:09:56 +0200 Message-ID: <20240610190956.2615107-3-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240610190956.2615107-1-michael@niedermayer.cc> References: <20240610190956.2615107-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 3/3] avfilter/af_amerge: Cleanup on av_channel_layout_copy() failure X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Qc5GKcvVrjND Fixes: CID1503088 Resource leak Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavfilter/af_amerge.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavfilter/af_amerge.c b/libavfilter/af_amerge.c index 493c8521388..67c87d1d9e5 100644 --- a/libavfilter/af_amerge.c +++ b/libavfilter/af_amerge.c @@ -246,8 +246,11 @@ static int try_push_frame(AVFilterContext *ctx, int nb_samples) av_make_q(1, outlink->sample_rate), outlink->time_base); - if ((ret = av_channel_layout_copy(&outbuf->ch_layout, &outlink->ch_layout)) < 0) + if ((ret = av_channel_layout_copy(&outbuf->ch_layout, &outlink->ch_layout)) < 0) { + free_frames(s->nb_inputs, inbuf); + av_frame_free(&outbuf); return ret; + } while (nb_samples) { /* Unroll the most common sample formats: speed +~350% for the loop,