diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2017-03-03 04:39:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-05-20 03:41:33 +0200 |
| commit | 1a8f1ae223a23d0b34c1aa1c2db94e4dcf25e92b (patch) | |
| tree | f1df95b5e45de9357c43d3292d6fa0491f8e5f7b | |
| parent | 66d81c5926f64316cca47fcca542fc1cbfaf04aa (diff) | |
| download | ffmpeg-1a8f1ae223a23d0b34c1aa1c2db94e4dcf25e92b.tar.gz | |
avcodec/adxdec: Fix runtime error: left shift of negative value -1
Fixes: 705/clusterfuzz-testcase-5129572590813184
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 d23727e0420b9f77f0d4cb28b43819b402f702e5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/adxdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adxdec.c b/libavcodec/adxdec.c index 32cc0f005a..178ea99dcf 100644 --- a/libavcodec/adxdec.c +++ b/libavcodec/adxdec.c @@ -81,7 +81,7 @@ static int adx_decode(ADXContext *c, int16_t *out, int offset, s2 = prev->s2; for (i = 0; i < BLOCK_SAMPLES; i++) { d = get_sbits(&gb, 4); - s0 = ((d << COEFF_BITS) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) >> COEFF_BITS; + s0 = ((d * (1 << COEFF_BITS)) * scale + c->coeff[0] * s1 + c->coeff[1] * s2) >> COEFF_BITS; s2 = s1; s1 = av_clip_int16(s0); *out++ = s1; |