diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-09-21 13:43:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-15 12:25:46 +0100 |
| commit | f83710ee4bbb1ff171697c79dcd8a133bc56f736 (patch) | |
| tree | ad82feb474d55d39caeb36820dd3fc2bad50ea3a | |
| parent | 9462ca109fbb8dd9d6b1ec0aa2a2403db3395e82 (diff) | |
| download | ffmpeg-f83710ee4bbb1ff171697c79dcd8a133bc56f736.tar.gz | |
avformat/mpsubdec: Clear queue on error
Fixes: Memleaks
Fixes: 17219/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5720539124989952
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 9a0d36e562d53716cf000895c2f892fb1f48165d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/mpsubdec.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/mpsubdec.c b/libavformat/mpsubdec.c index 1236efa712..fc1731f26e 100644 --- a/libavformat/mpsubdec.c +++ b/libavformat/mpsubdec.c @@ -106,6 +106,9 @@ static int mpsub_read_header(AVFormatContext *s) ff_subtitles_queue_finalize(s, &mpsub->q); end: + if (res < 0) + ff_subtitles_queue_clean(&mpsub->q); + av_bprint_finalize(&buf, NULL); return res; } |