[FFmpeg-cvslog] avformat/subviewerdec: Fix memleak upon read header failure
Andreas Rheinhardt
git at videolan.org
Fri Jul 3 20:30:27 EEST 2020
ffmpeg | branch: release/3.2 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:27:11 2020 +0200| [2c6b124cace4222627b8bb96fdc7159ee29ea2fd] | committer: Andreas Rheinhardt
avformat/subviewerdec: 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 a708f652737eba08607df84394ca4bec6b458736)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2c6b124cace4222627b8bb96fdc7159ee29ea2fd
---
libavformat/subviewerdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/subviewerdec.c b/libavformat/subviewerdec.c
index af084f4856..e8d1eb6c96 100644
--- a/libavformat/subviewerdec.c
+++ b/libavformat/subviewerdec.c
@@ -156,6 +156,8 @@ static int subviewer_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &subviewer->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&subviewer->q);
av_bprint_finalize(&header, NULL);
return res;
}
More information about the ffmpeg-cvslog
mailing list