summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <[email protected]>2020-06-14 03:28:56 +0200
committerAndreas Rheinhardt <[email protected]>2020-07-01 21:38:35 +0200
commit4cfc3e8a1523e05c1e4c68ac51237dcebdec8fd3 (patch)
tree60ea814d0afc4c98cefad12a35092b2599ef9495
parentc86d0c0f7cc68f3f3c820dad623d1888e0378070 (diff)
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 <[email protected]> (cherry picked from commit 67434afa7fcb2b411b10a4d09fb30cd3a5907c2c) Signed-off-by: Andreas Rheinhardt <[email protected]>
-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;