aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:26:40 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 16:54:06 +0200
commit9751d7515222c7b58d0c6fb31aec6e0464c0f338 (patch)
treee131da40713a91a316b7655ce9a7e34cc9caf294
parente13874b9eae4e156ca1c478e6d59d3461bbdc09f (diff)
downloadffmpeg-9751d7515222c7b58d0c6fb31aec6e0464c0f338.tar.gz
avformat/subviewer1dec: 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>
-rw-r--r--libavformat/subviewer1dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/subviewer1dec.c b/libavformat/subviewer1dec.c
index 1360d9b7d9..f2eee294a1 100644
--- a/libavformat/subviewer1dec.c
+++ b/libavformat/subviewer1dec.c
@@ -77,8 +77,10 @@ static int subviewer1_read_header(AVFormatContext *s)
sub->duration = pts_start - sub->pts;
} else {
sub = ff_subtitles_queue_insert(&subviewer1->q, line, len, 0);
- if (!sub)
+ if (!sub) {
+ ff_subtitles_queue_clean(&subviewer1->q);
return AVERROR(ENOMEM);
+ }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = -1;