diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-20 19:13:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-12-31 19:51:57 +0100 |
| commit | 090d10ce607db53c45dfdb2c9f832ab0e05274e0 (patch) | |
| tree | ad9cd40dc6c4490992fcfbdd3c146491889431fc | |
| parent | 7a1b6aa6aca9ce1e62ab18276e476bb2564607ec (diff) | |
| download | ffmpeg-090d10ce607db53c45dfdb2c9f832ab0e05274e0.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>
(cherry picked from commit 50db30b47d016fc4e7b47067545b15d22d4faddf)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -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 25db285213..0dc5da7ab5 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -436,7 +436,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; @@ -463,7 +463,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; |