[FFmpeg-cvslog] avfilter/af_amerge: Cleanup on av_channel_layout_copy() failure

Michael Niedermayer git at videolan.org
Mon Jul 8 00:39:51 EEST 2024


ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Mon Jun 10 15:18:07 2024 +0200| [62d4414d54f57612ac444643a92de7d10455b6c6] | committer: Michael Niedermayer

avfilter/af_amerge: Cleanup on av_channel_layout_copy() failure

Fixes: CID1503088 Resource leak

Sponsored-by: Sovereign Tech Fund
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=62d4414d54f57612ac444643a92de7d10455b6c6
---

 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 493c852138..67c87d1d9e 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,



More information about the ffmpeg-cvslog mailing list