summaryrefslogtreecommitdiff
path: root/libavcodec/iff.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-10 12:04:05 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-05-11 00:45:09 +0200
commit7a92147f87129851c1cc2c15f4ba714b8cf23f71 (patch)
tree83e0c7e51baae95e292300ef7bad54e1a0be3c9a /libavcodec/iff.c
parent82d4c7b95ed98d38aa834ef5a8fb1d2ef3901698 (diff)
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>
Diffstat (limited to 'libavcodec/iff.c')
-rw-r--r--libavcodec/iff.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 75be844a95..b39bb2c312 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -1378,11 +1378,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--;