]> git.sesse.net Git - ffmpeg/commitdiff
avformat/voc_packet: Add a basic check on max_size
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 12 Dec 2020 00:24:42 +0000 (01:24 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 1 Mar 2021 19:19:15 +0000 (20:19 +0100)
Fixes: signed integer overflow: -2147483648 - 4 cannot be represented in type 'int'
Fixes: 28127/clusterfuzz-testcase-minimized-ffmpeg_dem_VOC_fuzzer-4880586455646208
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/voc_packet.c

index 1e2e19e1c36b97b34b032e74f7c76348d21bacbe..9d7d2025cd7c2a22327531fd68ae9761559c394c 100644 (file)
@@ -44,6 +44,8 @@ ff_voc_get_packet(AVFormatContext *s, AVPacket *pkt, AVStream *st, int max_size)
                        AVINDEX_KEYFRAME);
 
     while (!voc->remaining_size) {
+        if (max_size < 4)
+            max_size = 0;
         type = avio_r8(pb);
         if (type == VOC_TYPE_EOF)
             return AVERROR_EOF;