diff mbox series

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

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


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
or when creating extradata.

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


diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index fd98393086..3070ef9bac 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -108,6 +108,8 @@  static int sami_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &sami->q);
+    if (res < 0)
+        ff_subtitles_queue_clean(&sami->q);
     av_bprint_finalize(&buf, NULL);
     return res;