]> git.sesse.net Git - ffmpeg/commitdiff
avformat/takdec: Check for multiple streaminfo
authorMichael Niedermayer <michael@niedermayer.cc>
Tue, 2 Jul 2019 19:11:57 +0000 (21:11 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 17 Jul 2019 21:18:50 +0000 (23:18 +0200)
Fixes: memleak
Fixes: 15446/clusterfuzz-testcase-minimized-ffmpeg_DEMUXER_fuzzer-5662875831500800
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/takdec.c

index c51a020161db61f8898ff84721022c15053ca8b4..5e0601806f9c9aa3b7b6072d30b2b9cd88908943 100644 (file)
@@ -80,6 +80,8 @@ static int tak_read_header(AVFormatContext *s)
 
         switch (type) {
         case TAK_METADATA_STREAMINFO:
+            if (st->codecpar->extradata)
+                return AVERROR_INVALIDDATA;
         case TAK_METADATA_LAST_FRAME:
         case TAK_METADATA_ENCODER:
             if (size <= 3)