mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
avcodec/rv40dsp: Fix integer overflows in rv40_weight_func_*()
Fixes: signed integer overflow: 40550400 * 128 cannot be represented in type 'int' Fixes: 20331/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_RV40_fuzzer-5676685725007872 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
2a322906b7
commit
13171ad2e3
@ -385,7 +385,7 @@ static void rv40_weight_func_rnd_ ## size (uint8_t *dst, uint8_t *src1, uint8_t
|
||||
\
|
||||
for (j = 0; j < size; j++) {\
|
||||
for (i = 0; i < size; i++)\
|
||||
dst[i] = (((w2 * src1[i]) >> 9) + ((w1 * src2[i]) >> 9) + 0x10) >> 5;\
|
||||
dst[i] = ((((unsigned)w2 * src1[i]) >> 9) + (((unsigned)w1 * src2[i]) >> 9) + 0x10) >> 5;\
|
||||
src1 += stride;\
|
||||
src2 += stride;\
|
||||
dst += stride;\
|
||||
@ -397,7 +397,7 @@ static void rv40_weight_func_nornd_ ## size (uint8_t *dst, uint8_t *src1, uint8_
|
||||
\
|
||||
for (j = 0; j < size; j++) {\
|
||||
for (i = 0; i < size; i++)\
|
||||
dst[i] = (w2 * src1[i] + w1 * src2[i] + 0x10) >> 5;\
|
||||
dst[i] = ((unsigned)w2 * src1[i] + (unsigned)w1 * src2[i] + 0x10) >> 5;\
|
||||
src1 += stride;\
|
||||
src2 += stride;\
|
||||
dst += stride;\
|
||||
|
Loading…
Reference in New Issue
Block a user