summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <[email protected]>2019-10-26 21:56:03 +0200
committerMichael Niedermayer <[email protected]>2019-12-31 19:51:56 +0100
commit99243eea7b608472a2bcc8377a1862cc8fe62802 (patch)
tree5896f2bcf300c730dd787669cddd4ed86cb65afe
parent87e8bfeb908c94deb5616065af53712efb3704ce (diff)
avcodec/g723_1dec: fix invalid shift with negative sid_gain
Fixes: left shift of negative value -1 Fixes: 18395/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_G723_1_fuzzer-5710313034350592 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Reviewed-by: Paul B Mahol <[email protected]> Signed-off-by: Michael Niedermayer <[email protected]> (cherry picked from commit 1850c3feaa1c7b5b63a55c61075029fa59c84e66) Signed-off-by: Michael Niedermayer <[email protected]>
-rw-r--r--libavcodec/g723_1dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g723_1dec.c b/libavcodec/g723_1dec.c
index d3eea2d5d7..802a2cbc16 100644
--- a/libavcodec/g723_1dec.c
+++ b/libavcodec/g723_1dec.c
@@ -677,7 +677,7 @@ static int estimate_sid_gain(G723_1_ChannelContext *p)
if (p->sid_gain < 0) t = INT32_MIN;
else t = INT32_MAX;
} else
- t = p->sid_gain << shift;
+ t = p->sid_gain * (1 << shift);
} else if(shift < -31) {
t = (p->sid_gain < 0) ? -1 : 0;
}else