diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-10 12:04:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-03 12:10:24 +0200 |
| commit | 240b5f73f13b8f57e018d26965d573ed13bf09a5 (patch) | |
| tree | 773c7c39b725a8175b9d230cc2648f25e3cb2b21 | |
| parent | dd835730435a625e0f2414d154906cb0b6fece2b (diff) | |
| download | ffmpeg-240b5f73f13b8f57e018d26965d573ed13bf09a5.tar.gz | |
avcodec/iff: Fix several integer overflows
Fixes: negation of -2147483648 cannot be represented in type 'int32_t' (aka 'int'); cast to an unsigned type to negate this value to itself
Fixes: signed integer overflow: -2147483648 - 1 cannot be represented in type 'int32_t' (aka 'int')
Fixes: 20492/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5764066459254784
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 7a92147f87129851c1cc2c15f4ba714b8cf23f71)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/iff.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c index 83d0ee524d..fcc5c67430 100644 --- a/libavcodec/iff.c +++ b/libavcodec/iff.c @@ -1375,11 +1375,10 @@ static void decode_delta_d(uint8_t *dst, opcode--; } } else { - opcode = -opcode; while (opcode && bytestream2_get_bytes_left(&gb) > 0) { bytestream2_put_be32(&pb, bytestream2_get_be32(&gb)); bytestream2_skip_p(&pb, pitch - 4); - opcode--; + opcode++; } } entries--; |