diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-18 14:28:17 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-27 17:50:47 +0200 |
commit | 9a68341e9ee90e8f02d3aea7b8a981a867e8da14 (patch) | |
tree | 13f5dde4a8dd54bc9f57a620707f917c023b0446 /libavcodec/bink.c | |
parent | da081ecf69f4c46c6638abb28b0acac33c2be075 (diff) | |
download | ffmpeg-9a68341e9ee90e8f02d3aea7b8a981a867e8da14.tar.gz |
avcodec/bink: Fix integer overflow in unquantize_dct_coeffs()
Fixes: signed integer overflow: -3447 * 2883584 cannot be represented in type 'int'
Fixes: 15265/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_BINK_fuzzer-5088311799971840
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 62ad08cef993f7a103b6d3a5498f6fa49190e085)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/bink.c')
-rw-r--r-- | libavcodec/bink.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/bink.c b/libavcodec/bink.c index a0784f9482..ca10a0ce81 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -702,15 +702,15 @@ static int read_dct_coeffs(GetBitContext *gb, int32_t block[64], return quant_idx; } -static void unquantize_dct_coeffs(int32_t block[64], const int32_t quant[64], +static void unquantize_dct_coeffs(int32_t block[64], const uint32_t quant[64], int coef_count, int coef_idx[64], const uint8_t *scan) { int i; - block[0] = (block[0] * quant[0]) >> 11; + block[0] = (int)(block[0] * quant[0]) >> 11; for (i = 0; i < coef_count; i++) { int idx = coef_idx[i]; - block[scan[idx]] = (block[scan[idx]] * quant[idx]) >> 11; + block[scan[idx]] = (int)(block[scan[idx]] * quant[idx]) >> 11; } } |