diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-10 12:04:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-05-19 17:17:36 +0200 |
| commit | ed96d963037359651a02617adf1b0b690b60008c (patch) | |
| tree | 4339dcef28bf4b504b079149c88e3d86b9c0b6cb | |
| parent | 07388eee457e3a91c1944966ec6556de7bc296a3 (diff) | |
| download | ffmpeg-ed96d963037359651a02617adf1b0b690b60008c.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 a38de9979e..6e55af33c0 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--; |