[FFmpeg-cvslog] avformat/samidec: Fix memleak upon read header failure
Andreas Rheinhardt
git at videolan.org
Fri Jul 3 16:09:21 EEST 2020
ffmpeg | branch: release/3.3 | Andreas Rheinhardt <andreas.rheinhardt at gmail.com> | Sun Jun 14 03:21:46 2020 +0200| [c9b6385c16217d6d229076028abb3cb54f0dbf3c] | committer: Andreas Rheinhardt
avformat/samidec: 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
or when creating extradata.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
(cherry picked from commit f161f8e4ad10c8ae5b2e97870e09bc6a421408eb)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c9b6385c16217d6d229076028abb3cb54f0dbf3c
---
libavformat/samidec.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/libavformat/samidec.c b/libavformat/samidec.c
index 7ea1bdfdd9..678fac0e17 100644
--- a/libavformat/samidec.c
+++ b/libavformat/samidec.c
@@ -108,6 +108,8 @@ static int sami_read_header(AVFormatContext *s)
ff_subtitles_queue_finalize(s, &sami->q);
end:
+ if (res < 0)
+ ff_subtitles_queue_clean(&sami->q);
av_bprint_finalize(&buf, NULL);
return res;
}
More information about the ffmpeg-cvslog
mailing list