[FFmpeg-cvslog] avfilter/af_join: fix possible memory leaks

Paul B Mahol git at videolan.org
Mon Oct 21 17:07:51 EEST 2019


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Oct 21 16:03:22 2019 +0200| [aa26f83bdd7ea1f5850520fc25aae38315f6338b] | committer: Paul B Mahol

avfilter/af_join: fix possible memory leaks

Allocation of input frames is independent from
allocation of new input pads.

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

 libavfilter/af_join.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c
index e5d178c1ce..ea03b60d67 100644
--- a/libavfilter/af_join.c
+++ b/libavfilter/af_join.c
@@ -207,9 +207,12 @@ static av_cold void join_uninit(AVFilterContext *ctx)
     JoinContext *s = ctx->priv;
     int i;
 
+    for (i = 0; i < s->inputs && s->input_frames; i++) {
+        av_frame_free(&s->input_frames[i]);
+    }
+
     for (i = 0; i < ctx->nb_inputs; i++) {
         av_freep(&ctx->input_pads[i].name);
-        av_frame_free(&s->input_frames[i]);
     }
 
     av_freep(&s->channels);



More information about the ffmpeg-cvslog mailing list