]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mpsubdec: Clear queue on error
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 21 Sep 2019 11:43:19 +0000 (13:43 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Tue, 8 Oct 2019 14:24:58 +0000 (16:24 +0200)
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>
libavformat/mpsubdec.c

index 3d8dcb35c2b853d713a041392fcdca5f489c0f61..82c73457ead69b2813ad2bb836a3b7a58ad44814 100644 (file)
@@ -163,6 +163,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;
 }