aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-14 03:28:56 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@gmail.com>2020-06-15 17:30:33 +0200
commitb7897f03199e65d546729b319cca9909d46cf214 (patch)
tree90cec2f57ccaa9e3a6e568bd07ccb3c124c33758
parent6eac7d79f4e7282567793d5c52ec84a646cac840 (diff)
downloadffmpeg-b7897f03199e65d546729b319cca9909d46cf214.tar.gz
avformat/vplayerdec: 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 67434afa7fcb2b411b10a4d09fb30cd3a5907c2c)
-rw-r--r--libavformat/vplayerdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/vplayerdec.c b/libavformat/vplayerdec.c
index e3e7b4efb8..ca23ec76ac 100644
--- a/libavformat/vplayerdec.c
+++ b/libavformat/vplayerdec.c
@@ -83,8 +83,10 @@ static int vplayer_read_header(AVFormatContext *s)
AVPacket *sub;
sub = ff_subtitles_queue_insert(&vplayer->q, p, strlen(p), 0);
- if (!sub)
+ if (!sub) {
+ ff_subtitles_queue_clean(&vplayer->q);
return AVERROR(ENOMEM);
+ }
sub->pos = pos;
sub->pts = pts_start;
sub->duration = -1;