[FFmpeg-cvslog] avformat/vplayerdec: Fix memleak upon read header failure
Andreas Rheinhardt
git at videolan.org
Wed Jul 1 23:08:11 EEST 2020
ffmpeg | branch: release/4.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:28:56 2020 +0200| [4cfc3e8a1523e05c1e4c68ac51237dcebdec8fd3] | committer: Andreas Rheinhardt
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 at gmail.com>
(cherry picked from commit 67434afa7fcb2b411b10a4d09fb30cd3a5907c2c)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cfc3e8a1523e05c1e4c68ac51237dcebdec8fd3
---
libavformat/vplayerdec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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;
More information about the ffmpeg-cvslog
mailing list