aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2019-09-27 17:53:35 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2019-11-11 20:18:48 +0100
commit9d6b1a9c2b2ea27a22a6f7768cc84d40f52307fb (patch)
tree1aa559420b0b65520e08452e33c5c30e6e5f1634
parent298408431f32161bc78a6ed1f8ac0f1b78d83eaa (diff)
downloadffmpeg-9d6b1a9c2b2ea27a22a6f7768cc84d40f52307fb.tar.gz
avcodec/g723_1dec: Fix overflow in shift
Fixes: shift exponent 1008 is too large for 32-bit type 'int' Fixes: 17700/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5707633436131328 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 07732f12a43ac3048e44c086c9a8c811452ba31c) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/g723_1dec.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c
index ab952ec66d..f92eb76ba0 100644
--- a/libavcodec/g723_1dec.c
+++ b/libavcodec/g723_1dec.c
@@ -668,6 +668,8 @@ static int estimate_sid_gain(G723_1_Context *p)
else t = INT32_MAX;
} else
t = p->sid_gain << shift;
+ } else if(shift < -31) {
+ t = (p->sid_gain < 0) ? -1 : 0;
}else
t = p->sid_gain >> -shift;
x = av_clipl_int32(t * (int64_t)cng_filt[0] >> 16);