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

Andreas Rheinhardt git at videolan.org
Fri Jul 3 03:11:32 EEST 2020


ffmpeg | branch: release/3.4 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:07:28 2020 +0200| [91016727dc9e2fbbfc6cb3622d090334d9a06f10] | committer: Andreas Rheinhardt

avformat/assdec: 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 if creating the extradata failed.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit 5ab39c2d8c1e5e00b48d758eee7d5ae435a99ef7)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

 libavformat/assdec.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index d89c14e5b8..3b580fc4d2 100644
--- a/libavformat/assdec.c
+++ b/libavformat/assdec.c
@@ -160,6 +160,8 @@ static int ass_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &ass->q);
 
 end:
+    if (res < 0)
+        ass_read_close(s);
     av_bprint_finalize(&header, NULL);
     av_bprint_finalize(&line,   NULL);
     av_bprint_finalize(&rline,  NULL);



More information about the ffmpeg-cvslog mailing list