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

Andreas Rheinhardt git at videolan.org
Mon Jun 15 18:23:35 EEST 2020


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:29:17 2020 +0200| [c784fe8b867e42a1c8d2c48d7046e3e0cce7ec31] | committer: Andreas Rheinhardt

avformat/webvttdec: 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.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

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

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 6c4d5f6736..bd3d45b382 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -164,6 +164,8 @@ static int webvtt_read_header(AVFormatContext *s)
     ff_subtitles_queue_finalize(s, &webvtt->q);
 
 end:
+    if (res < 0)
+        ff_subtitles_queue_clean(&webvtt->q);
     av_bprint_finalize(&cue,    NULL);
     return res;
 }



More information about the ffmpeg-cvslog mailing list