aboutsummaryrefslogtreecommitdiffstats
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-01 21:38:41 +0200
commit5a2fbc43b7dc9670a806cc9d07470a82d6245a7b (patch)
tree2851091d53193e9fd70b9c7f5dd98653e7ed7f73
parent4cfc3e8a1523e05c1e4c68ac51237dcebdec8fd3 (diff)
downloadffmpeg-5a2fbc43b7dc9670a806cc9d07470a82d6245a7b.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 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;