diff mbox series

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

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

Checks

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 if creating the extradata failed.

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

Patch

diff --git a/libavformat/assdec.c b/libavformat/assdec.c
index f66b296673..8fb9e8e501 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);