| Message ID | 20180107031258.12135-1-michael@niedermayer.cc |
|---|---|
| State | Accepted |
| Commit | b3192c64b5bdcb0474cda437d2d5f9421d68811e |
| Headers | show |
2018-01-07 4:12 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > Fixes: signed integer overflow: 46802 * -71230 cannot be represented in type 'int' > Fixes: 4756/clusterfuzz-testcase-minimized-4812495563784192 First letter of commit message... Carl Eugen
On Sun, Jan 07, 2018 at 04:16:34AM +0100, Carl Eugen Hoyos wrote: > 2018-01-07 4:12 GMT+01:00 Michael Niedermayer <michael@niedermayer.cc>: > > Fixes: signed integer overflow: 46802 * -71230 cannot be represented in type 'int' > > Fixes: 4756/clusterfuzz-testcase-minimized-4812495563784192 > > First letter of commit message... thx, will push with that fixed [...]
diff --git a/libavcodec/jpeg2000dsp.c b/libavcodec/jpeg2000dsp.c index 85a12d0e9b..90e73b1e20 100644 --- a/libavcodec/jpeg2000dsp.c +++ b/libavcodec/jpeg2000dsp.c @@ -64,9 +64,9 @@ static void ict_int(void *_src0, void *_src1, void *_src2, int csize) int i; for (i = 0; i < csize; i++) { - i0 = *src0 + *src2 + (((26345 * *src2) + (1 << 15)) >> 16); + i0 = *src0 + *src2 + ((int)((26345U * *src2) + (1 << 15)) >> 16); i1 = *src0 - ((int)(((unsigned)i_ict_params[1] * *src1) + (1 << 15)) >> 16) - - (((i_ict_params[2] * *src2) + (1 << 15)) >> 16); + - ((int)(((unsigned)i_ict_params[2] * *src2) + (1 << 15)) >> 16); i2 = *src0 + (2 * *src1) + ((int)((-14942U * *src1) + (1 << 15)) >> 16); *src0++ = i0; *src1++ = i1;
Fixes: signed integer overflow: 46802 * -71230 cannot be represented in type 'int' Fixes: 4756/clusterfuzz-testcase-minimized-4812495563784192 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> --- libavcodec/jpeg2000dsp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)