diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-11-08 00:08:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2021-02-02 14:18:21 +0100 |
| commit | 28df673d7d2bfc0b4a2aa1f86e0e684045f3c473 (patch) | |
| tree | 0d67fe32bd691aa44efaec2c81036afd8034f213 | |
| parent | 9e1fede2315c5ab0ca87290eaff7facfe7bbc43c (diff) | |
| download | ffmpeg-28df673d7d2bfc0b4a2aa1f86e0e684045f3c473.tar.gz | |
avcodec/cfhd: check peak.offset
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>
(cherry picked from commit 386faeda5ff1924c17766248ce19528dbf90cf15)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/cfhd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/cfhd.c b/libavcodec/cfhd.c index d682c25ed0..fac1892cec 100644 --- a/libavcodec/cfhd.c +++ b/libavcodec/cfhd.c @@ -611,6 +611,12 @@ static int cfhd_decode(AVCodecContext *avctx, void *data, int *got_frame, s->peak.level = 0; } else if (tag == -74 && 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); |