summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:29:17 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-07-02 10:15:09 +0200
commit0085ac2779672f82897d64aa218f2aaaf0954ad6 (patch)
treef40b7b5087e347617c5439ea44e02443a950dbe3
parent00f2f0b632acddae0315d44773b629480298d813 (diff)
downloadffmpeg-0085ac2779672f82897d64aa218f2aaaf0954ad6.tar.gz
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@gmail.com> (cherry picked from commit c784fe8b867e42a1c8d2c48d7046e3e0cce7ec31) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/webvttdec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/webvttdec.c b/libavformat/webvttdec.c
index 0aeb8a63f4..8e9c562683 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;