diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2020-03-01 22:46:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2020-07-02 19:55:09 +0200 |
| commit | 807af727507ac125c1ec4706d1dad44f67f373c7 (patch) | |
| tree | 4b1e2f0b327e49edb778f8882e11033edfe448df | |
| parent | 51d2137b98592ac43ac700270db14f4546f1aeb3 (diff) | |
| download | ffmpeg-807af727507ac125c1ec4706d1dad44f67f373c7.tar.gz | |
avcodec/adpcm: Fix invalid shift in AV_CODEC_ID_ADPCM_PSX
Fixes: left shift of negative value -1
Fixes: 20859/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_PSX_fuzzer-5720391507247104
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 0a11ef68f0a85905e704e503b433f5aa645d59ac)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/adpcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 3560cae472..787dd5380a 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1667,7 +1667,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, scale = sign_extend(byte, 4); } - scale = scale << 12; + scale = scale * (1 << 12); sample = (int)((scale >> shift) + (c->status[channel].sample1 * xa_adpcm_table[filter][0] + c->status[channel].sample2 * xa_adpcm_table[filter][1]) / 64); } *samples++ = av_clip_int16(sample); |