[FFmpeg-cvslog] avformat/srtdec: Fix memleak upon read header failure
Andreas Rheinhardt
git at videolan.org
Mon Jun 15 18:44:00 EEST 2020
ffmpeg | branch: release/4.3 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:23:27 2020 +0200| [157bbc779c5124b7f6aee39df6399425f12dc2e2] | committer: Andreas Rheinhardt
avformat/srtdec: 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 c70409957c7332971f0e147729d769f6d2f95390)
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=157bbc779c5124b7f6aee39df6399425f12dc2e2
---
libavformat/srtdec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/srtdec.c b/libavformat/srtdec.c
index 40d324b44d..d6ff00ba6d 100644
--- a/libavformat/srtdec.c
+++ b/libavformat/srtdec.c
@@ -207,6 +207,8 @@ static int srt_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &srt->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&srt->q);
av_bprint_finalize(&buf, NULL);
return res;
}
More information about the ffmpeg-cvslog
mailing list