avcodec/jpeg2000dwt: Fix integer overflow in dwt_decode97_int()
authorMichael Niedermayer <michael@niedermayer.cc>
Mon, 18 Feb 2019 23:05:51 +0000 (00:05 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 1 Mar 2019 22:25:08 +0000 (23:25 +0100)
Fixes: runtime error: signed integer overflow: 2147483598 + 128 cannot be represented in type 'int'
Fixes: 12926/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_JPEG2000_fuzzer-5705100733972480

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavcodec/jpeg2000dwt.c

index ce1678a..badf0f8 100644 (file)
@@ -531,7 +531,7 @@ static void dwt_decode97_int(DWTContext *s, int32_t *t)
     }
 
     for (i = 0; i < w * h; i++)
-        data[i] = (data[i] + ((1<<I_PRESHIFT)>>1)) >> I_PRESHIFT;
+        data[i] = (data[i] + ((1LL<<I_PRESHIFT)>>1)) >> I_PRESHIFT;
 }
 
 int ff_jpeg2000_dwt_init(DWTContext *s, int border[2][2],