diff options
| author | Michael Niedermayer <[email protected]> | 2019-10-25 11:12:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2019-11-11 20:18:48 +0100 |
| commit | 3b3c2fd2c72eb4c7ecb14e1d67767eff3d5f4f61 (patch) | |
| tree | 99b465ee39ac154d2708d01103a0f2b28744bd78 | |
| parent | 1ab695494019ad3550efee679bb4f7c07ad46a83 (diff) | |
avcodec/adpcm: Fix undefined behavior with negative predictions in IMA OKI
Fixes: left shift of negative value -30
Fixes: 18392/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_ADPCM_IMA_OKI_fuzzer-5631771831435264
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit 7786f6c30e77a393b72ded01baa4250738925509)
Signed-off-by: Michael Niedermayer <[email protected]>
| -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 98cebb090d..5dc5704a4d 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -293,7 +293,7 @@ static inline int16_t adpcm_ima_oki_expand_nibble(ADPCMChannelStatus *c, int nib c->predictor = av_clip_intp2(predictor, 11); c->step_index = step_index; - return c->predictor << 4; + return c->predictor * 16; } static inline int16_t adpcm_ct_expand_nibble(ADPCMChannelStatus *c, int8_t nibble) |