]> git.sesse.net Git - ffmpeg/commitdiff
avformat/flvdec: Check array entry number
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 11 Feb 2021 21:58:53 +0000 (22:58 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 28 Mar 2021 12:20:00 +0000 (14:20 +0200)
Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int'
Fixes: 30209/clusterfuzz-testcase-minimized-ffmpeg_dem_FLV_fuzzer-5724831658147840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/flvdec.c

index e4b40a195c2065cf3d631056f2fcd00d03d32d46..fca6f82f5c56b497ff7f2e7ec1c4584d8d65e327 100644 (file)
@@ -875,6 +875,8 @@ static int amf_skip_tag(AVIOContext *pb, AMFDataType type, int depth)
         parse_name = 0;
     case AMF_DATA_TYPE_MIXEDARRAY:
         nb = avio_rb32(pb);
+        if (nb < 0)
+            return AVERROR_INVALIDDATA;
     case AMF_DATA_TYPE_OBJECT:
         while(!pb->eof_reached && (nb-- > 0 || type != AMF_DATA_TYPE_ARRAY)) {
             if (parse_name) {