diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-05 22:17:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-14 12:20:15 +0200 |
| commit | 1f91d66a62d10f55b9e89bdfe57d129445e00d43 (patch) | |
| tree | 38fc34e391c057ee2d9e13b2c59b15f772fc88c4 | |
| parent | 536af4212100dee1577fe2d30814762c58038efc (diff) | |
| download | ffmpeg-1f91d66a62d10f55b9e89bdfe57d129445e00d43.tar.gz | |
avcodec/mdec: Fix signed integer overflow: 28835400 * 83 cannot be represented in type 'int'
Fixes: 1346/clusterfuzz-testcase-minimized-5776732600664064
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit a234b5ade3ca6cde805b92b8b6ecacf693460a8c)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/mdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mdec.c b/libavcodec/mdec.c index 42bd561cd7..8e28aa04f0 100644 --- a/libavcodec/mdec.c +++ b/libavcodec/mdec.c @@ -111,11 +111,11 @@ static inline int mdec_decode_block_intra(MDECContext *a, int16_t *block, int n) j = scantable[i]; if (level < 0) { level = -level; - level = (level * qscale * quant_matrix[j]) >> 3; + level = (level * (unsigned)qscale * quant_matrix[j]) >> 3; level = (level - 1) | 1; level = -level; } else { - level = (level * qscale * quant_matrix[j]) >> 3; + level = (level * (unsigned)qscale * quant_matrix[j]) >> 3; level = (level - 1) | 1; } } |