diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-05-25 21:56:04 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-06-18 01:16:04 +0200 |
| commit | c91f199f5d19a4924edb18fe39a21c5e69bca3d3 (patch) | |
| tree | 65b958e4c142527b8626f6788395d25e24335982 | |
| parent | bd1fd3ff4b0437153a6c4717f59ce31a7bba8ca0 (diff) | |
| download | ffmpeg-c91f199f5d19a4924edb18fe39a21c5e69bca3d3.tar.gz | |
avcodec/g723_1dec: Clip bits2 in both directions
Fixes: shift exponent 33 is too large for 32-bit type 'int'
Fixes: 6743/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5823772687859712
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 53f241218d9eac368e2e1c58bcca9bbdf10fd0e1)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/g723_1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c index c8202a937c..ab952ec66d 100644 --- a/libavcodec/g723_1dec.c +++ b/libavcodec/g723_1dec.c @@ -549,7 +549,7 @@ static void gain_scale(G723_1_Context *p, int16_t * buf, int energy) denom <<= bits2; bits2 = 5 + bits1 - bits2; - bits2 = FFMAX(0, bits2); + bits2 = av_clip_uintp2(bits2, 5); gain = (num >> 1) / (denom >> 16); gain = square_root(gain << 16 >> bits2); |