aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2022-03-21 21:03:13 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2022-04-06 20:27:35 +0200
commit15006f48cd75fb7c93c06dde50b76ea1309cce00 (patch)
tree8956d85e93506b270c7f6fea3747bea172239952
parent977cfb719745dab296d748b6304f349b01ce6a08 (diff)
downloadffmpeg-15006f48cd75fb7c93c06dde50b76ea1309cce00.tar.gz
avcodec/exr: Avoid signed overflow in displayWindow
The inputs are unused except for this computation so wraparound does not give an attacker any extra values as they are already fully controlled Fixes: signed integer overflow: 0 - -2147483648 cannot be represented in type 'int' Fixes: 45820/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5766159019933696 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit 1291568c9834c02413ab5d87762308f15b4ae9c6) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/exr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 49ba7fd6de..b6bf87ab81 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1829,8 +1829,8 @@ static int decode_header(EXRContext *s, AVFrame *frame)
dx = bytestream2_get_le32(gb);
dy = bytestream2_get_le32(gb);
- s->w = dx - sx + 1;
- s->h = dy - sy + 1;
+ s->w = (unsigned)dx - sx + 1;
+ s->h = (unsigned)dy - sy + 1;
continue;
} else if ((var_size = check_header_variable(s, "lineOrder",