summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-04-21 00:03:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-04-22 22:57:38 +0200
commitb4a33387cb1cd3f4c5036e65e0fdd953c6b5012f (patch)
tree338c126bc9cd03da4ce0073e45bea96ed1c611e8
parentbc41a29a5aa3c3dedba0a85b4aeb79a07eeeb1b4 (diff)
avcodec/iff: Check length before memcpy() in decode_deep_rle32()
Fixes: out of array read Fixes: 20796/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_IFF_ILBM_fuzzer-5111364702175232.fuzz Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/iff.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/iff.c b/libavcodec/iff.c
index 2e65e266d0..75be844a95 100644
--- a/libavcodec/iff.c
+++ b/libavcodec/iff.c
@@ -722,6 +722,8 @@ static void decode_deep_rle32(uint8_t *dst, const uint8_t *src, int src_size, in
int size = opcode + 1;
for (i = 0; i < size; i++) {
int length = FFMIN(size - i, width);
+ if (src_end - src < length * 4)
+ return;
memcpy(dst + y*linesize + x * 4, src, length * 4);
src += length * 4;
x += length;