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

Andreas Rheinhardt git at videolan.org
Wed Jul 1 23:08:14 EEST 2020


ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:29:17 2020 +0200| [5a2fbc43b7dc9670a806cc9d07470a82d6245a7b] | 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>
(cherry picked from commit c784fe8b867e42a1c8d2c48d7046e3e0cce7ec31)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>

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

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

diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 52579c5ed2..6f22a1edf6 100644
--- a/libavformat/webvttdec.c
+++ b/libavformat/webvttdec.c
@@ -165,6 +165,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);
     av_bprint_finalize(&header, NULL);
     return res;



More information about the ffmpeg-cvslog mailing list