diff mbox series

[FFmpeg-devel,12/26] avformat/mpl2dec: Fix memleak upon read header failure

Message ID 20200614223656.21338-12-andreas.rheinhardt@gmail.com
State Accepted
Commit 331799747e7e995710f5dfc4d413cda35eb01289
Headers show
Series [FFmpeg-devel,01/26] avformat/matroskadec: Move AVBufferRef instead of copying, fix memleak | expand


Context Check Description
andriy/default pending
andriy/make success Make finished
andriy/make_fate success Make fate finished

Commit Message

Andreas Rheinhardt June 14, 2020, 10:36 p.m. UTC
The already parsed subtitles (contained in an FFDemuxSubtitlesQueue)
would leak if an error happened upon reading a subsequent subtitle.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
 libavformat/mpl2dec.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
diff mbox series


diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
index ddee638c31..bea258d9e9 100644
--- a/libavformat/mpl2dec.c
+++ b/libavformat/mpl2dec.c
@@ -111,8 +111,10 @@  static int mpl2_read_header(AVFormatContext *s)
             AVPacket *sub;
             sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0);
-            if (!sub)
+            if (!sub) {
+                ff_subtitles_queue_clean(&mpl2->q);
                 return AVERROR(ENOMEM);
+            }
             sub->pos = pos;
             sub->pts = pts_start;
             sub->duration = duration;