diff mbox series

[FFmpeg-devel,2/3] avcodec/exr: Better size checks

Message ID 20210621212544.15449-2-michael@niedermayer.cc
State Accepted
Commit 18b0dd07384b2987f24a4d0ba7600fde2787472a
Headers show
Series [FFmpeg-devel,1/3] avcodec/clearvideo: Check tile_size to be not too large | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Michael Niedermayer June 21, 2021, 9:25 p.m. UTC 
Fixes: signed integer overflow: 3530839700044513368 + 8386093932303352321 cannot be represented in type 'long long'
Fixes: 35182/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_EXR_fuzzer-5398383270428672

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/exr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/libavcodec/exr.c b/libavcodec/exr.c
index 4648ed7d62..e7387ffd66 100644
--- a/libavcodec/exr.c
+++ b/libavcodec/exr.c
@@ -1014,7 +1014,7 @@  static int dwa_uncompress(EXRContext *s, const uint8_t *src, int compressed_size
     dc_count = AV_RL64(src + 72);
     ac_compression = AV_RL64(src + 80);
 
-    if (compressed_size < 88LL + lo_size + ac_size + dc_size + rle_csize)
+    if (compressed_size < (uint64_t)(lo_size | ac_size | dc_size | rle_csize) || compressed_size < 88LL + lo_size + ac_size + dc_size + rle_csize)
         return AVERROR_INVALIDDATA;
 
     bytestream2_init(&gb, src + 88, compressed_size - 88);