summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-10-25 11:12:02 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-09 18:03:37 +0100
commit7786f6c30e77a393b72ded01baa4250738925509 (patch)
treeb459dada12258c896c3286553b9dd7be7f8a6a28
parent1c63edcdd208bf18a3be66e94deb6ac115f6364e (diff)
downloadffmpeg-streaming-7786f6c30e77a393b72ded01baa4250738925509.zip
ffmpeg-streaming-7786f6c30e77a393b72ded01baa4250738925509.tar.gz
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 <michael@niedermayer.cc>
-rw-r--r--libavcodec/adpcm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 53d8d0b..edf7052 100644
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -342,7 +342,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)
OpenPOWER on IntegriCloud