diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-20 19:13:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-15 01:01:22 +0100 |
| commit | 50db30b47d016fc4e7b47067545b15d22d4faddf (patch) | |
| tree | 3b500adaabd970777ee4b72daf8a8d6a1cb34db2 /libavcodec | |
| parent | 5d0b3e282a6a77d7b1d0c74c7a66e41f98f21f03 (diff) | |
| download | ffmpeg-50db30b47d016fc4e7b47067545b15d22d4faddf.tar.gz | |
avcodec/adpcm: Fix invalid shift in xa_decode()
Fixes: left shift of negative value -1
Fixes: 18859/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_XA_fuzzer-5748474213040128
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/adpcm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index edf7052636..73beb5050e 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -441,7 +441,7 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1, d = in[16+i+j*4]; t = sign_extend(d, 4); - s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6); + s = t*(1<<shift) + ((s_1*f0 + s_2*f1+32)>>6); s_2 = s_1; s_1 = av_clip_int16(s); out0[j] = s_1; @@ -468,7 +468,7 @@ static int xa_decode(AVCodecContext *avctx, int16_t *out0, int16_t *out1, d = in[16+i+j*4]; t = sign_extend(d >> 4, 4); - s = ( t<<shift ) + ((s_1*f0 + s_2*f1+32)>>6); + s = t*(1<<shift) + ((s_1*f0 + s_2*f1+32)>>6); s_2 = s_1; s_1 = av_clip_int16(s); out1[j] = s_1; |