aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:19:32 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 17:25:47 +0200
commitf1724907424f92217823b6da2487715f0a1d36bc (patch)
tree38e85bad5fe940cc633db3df0ef9e69c387350fa
parent330a757d41860bf70e93d7b6c19cb65390b069a9 (diff)
downloadffmpeg-f1724907424f92217823b6da2487715f0a1d36bc.tar.gz
avformat/mpl2dec: 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 331799747e7e995710f5dfc4d413cda35eb01289)
-rw-r--r--libavformat/mpl2dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
index ddee638c31..bea258d9e9 100644
--- a/libavformat/mpl2dec.c
+++ b/libavformat/mpl2dec.c
@@ -111,8 +111,10 @@ static int mpl2_read_header(AVFormatContext *s)
AVPacket *sub;
sub = ff_subtitles_queue_insert(&mpl2->q, p, strlen(p), 0);
- if (!sub)
+ if (!sub) {
+ ff_subtitles_queue_clean(&mpl2->q);
return AVERROR(ENOMEM);
+ }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = duration;