aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-10-27 02:23:20 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-31 22:56:14 +0100
commit9ef0472b265abd2aa38a33145e3a618307e05bb0 (patch)
tree21fb87f3f8229d553b266c49e7626789fdadae96
parent9ba9c5a16f476e5b0d5f7570416d596d89d310c9 (diff)
downloadffmpeg-9ef0472b265abd2aa38a33145e3a618307e05bb0.tar.gz
avcodec/aacdec_fixed: Fix integer overflow in predict()
Fixes: runtime error: signed integer overflow: -2110708110 + -82837504 cannot be represented in type 'int' Fixes: 3547/clusterfuzz-testcase-minimized-6009386439802880 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 0976752420706c0a8b3cb8fd61497a47c7d7270f) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/aacdec_fixed.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index 8f2fcd214b..81dcafa7a9 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -306,9 +306,9 @@ static av_always_inline void predict(PredictorState *ps, int *coef,
if (shift < 31) {
if (shift > 0) {
- *coef += (pv.mant + (1 << (shift - 1))) >> shift;
+ *coef += (unsigned)((pv.mant + (1 << (shift - 1))) >> shift);
} else
- *coef += pv.mant << -shift;
+ *coef += (unsigned)(pv.mant << -shift);
}
}