]> git.sesse.net Git - ffmpeg/commitdiff
avformat/aiffdec: Check that SSND is at least 8 bytes
authorMichael Niedermayer <michael@niedermayer.cc>
Wed, 3 Mar 2021 09:49:04 +0000 (10:49 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 3 Mar 2021 15:54:20 +0000 (16:54 +0100)
Fixes: Infinite loop
Fixes: 30874/clusterfuzz-testcase-minimized-ffmpeg_dem_AIFF_fuzzer-5933710488764416
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/aiffdec.c

index 5abc0c9643dbb7e9fb1f58f4c48cc81d19d0d5fd..dcaf1560b6075abe11c26deadfe5c6af9c04bef5 100644 (file)
@@ -286,6 +286,8 @@ static int aiff_read_header(AVFormatContext *s)
             get_meta(s, "comment"  , size);
             break;
         case MKTAG('S', 'S', 'N', 'D'):     /* Sampled sound chunk */
+            if (size < 8)
+                return AVERROR_INVALIDDATA;
             aiff->data_end = avio_tell(pb) + size;
             offset = avio_rb32(pb);      /* Offset of sound data */
             avio_rb32(pb);               /* BlockSize... don't care */