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

Andreas Rheinhardt andreas.rheinhardt at gmail.com
Mon Jun 15 01:36:45 EEST 2020


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 at gmail.com>
---
 libavformat/samidec.c | 2 ++
 1 file changed, 2 insertions(+)

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);
 
 end:
+    if (res < 0)
+        ff_subtitles_queue_clean(&sami->q);
     av_bprint_finalize(&buf, NULL);
     return res;
 }
-- 
2.20.1



More information about the ffmpeg-devel mailing list