aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-05-28 03:34:09 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-06-02 01:14:38 +0200
commitb330fec1ced7e967f9025e4131f9c29bfa00d3f6 (patch)
tree5565402e8ccc8da5479b373ae22f66fcc8fd9e94
parent1d589a93b07c107f13bf526f43d96f071fa4bd6a (diff)
downloadffmpeg-b330fec1ced7e967f9025e4131f9c29bfa00d3f6.tar.gz
avcodec/aacdec_fixed: Fix multiple runtime error: shift exponent 127 is too large for 32-bit type 'int'
Fixes: 1851/clusterfuzz-testcase-minimized-5692607495667712 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 6c3a63fc3d1be7ac947e38a165a299c9e5d37764) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aacdec_fixed.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 29a363dec8..b78a27a236 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -370,7 +370,9 @@ static void apply_dependent_coupling_fixed(AACContext *ac,
shift = (gain-1024) >> 3;
}
- if (shift < 0) {
+ if (shift < -31) {
+ // Nothing to do
+ } else if (shift < 0) {
shift = -shift;
round = 1 << (shift - 1);