[FFmpeg-cvslog] avformat/samidec: Fix memleak upon read header failure

Andreas Rheinhardt git at videolan.org
Wed Jul 1 23:07:54 EEST 2020


ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:21:46 2020 +0200| [5c9f00b47ea49425a3df3f0de4bea4c02d97e739] | committer: Andreas Rheinhardt

avformat/samidec: Fix memleak upon read header failure

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>
(cherry picked from commit f161f8e4ad10c8ae5b2e97870e09bc6a421408eb)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 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;
 }



More information about the ffmpeg-cvslog mailing list