]> git.sesse.net Git - ffmpeg/commitdiff
avcodec/cfhd: check peak.offset
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 7 Nov 2020 23:08:35 +0000 (00:08 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 29 Jan 2021 18:36:46 +0000 (19:36 +0100)
Fixes: signed integer overflow: -2147483648 - 4 cannot be represented in type 'int'
Fixes: 26907/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_CFHD_fuzzer-5746202330267648
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/cfhd.c

index aae6bd78db6f07bb5b4b2d0a9aa73cbe5c41ab8a..dfd56ae6ed8fe364a2130a4a91c93b45be06cd2c 100644 (file)
@@ -617,6 +617,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame,
             s->peak.level   = 0;
         } else if (tag == -PeakLevel && s->peak.offset) {
             s->peak.level = data;
+            if (s->peak.offset < 4 - bytestream2_tell(&s->peak.base) ||
+                s->peak.offset > 4 + bytestream2_get_bytes_left(&s->peak.base)
+            ) {
+                ret = AVERROR_INVALIDDATA;
+                goto end;
+            }
             bytestream2_seek(&s->peak.base, s->peak.offset - 4, SEEK_CUR);
         } else
             av_log(avctx, AV_LOG_DEBUG,  "Unknown tag %i data %x\n", tag, data);