diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-06-14 03:21:46 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2020-07-02 10:15:09 +0200 |
| commit | c334959666521a65fcb256c6ae252abbfa5d7262 (patch) | |
| tree | ea2d113247770db66069a073dfdcd1e2e78c5b2b | |
| parent | fe43ff01d12e41f6bc4800fa6c125557744010e2 (diff) | |
| download | ffmpeg-c334959666521a65fcb256c6ae252abbfa5d7262.tar.gz | |
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@gmail.com>
(cherry picked from commit f161f8e4ad10c8ae5b2e97870e09bc6a421408eb)
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
| -rw-r--r-- | libavformat/samidec.c | 2 |
1 files changed, 2 insertions, 0 deletions
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; } |