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-07-02 01:01:30 +0200
commitb6986da62c9a6abc1b8874ea9a376af9b6c1dd07 (patch)
tree8ddcc6e74fc512147d2fcf1170e971e74cefe452
parentf6b9f7531c3701af2f0c1a55eb367523d4ced4ff (diff)
downloadffmpeg-b6986da62c9a6abc1b8874ea9a376af9b6c1dd07.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) Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
-rw-r--r--libavformat/mpl2dec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
index dfcdf5a564..0c111e9dc1 100644
--- a/libavformat/mpl2dec.c
+++ b/libavformat/mpl2dec.c
@@ -108,8 +108,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;