[FFmpeg-cvslog] avformat/mpl2dec: Fix memleak upon read header failure
Andreas Rheinhardt
git at videolan.org
Fri Jul 3 03:11:41 EEST 2020
ffmpeg | branch: release/3.4 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:19:32 2020 +0200| [036c52f2d6b9f42e171b186cf2a038b8684d3f71] | committer: Andreas Rheinhardt
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 at gmail.com>
(cherry picked from commit 331799747e7e995710f5dfc4d413cda35eb01289)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=036c52f2d6b9f42e171b186cf2a038b8684d3f71
---
libavformat/mpl2dec.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libavformat/mpl2dec.c b/libavformat/mpl2dec.c
index 0665c4c635..c25f85e0e3 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;
More information about the ffmpeg-cvslog
mailing list