diff mbox

[FFmpeg-devel,1/2] avcodec/aacdec_fixed: Fix integer overflow in predict()

Message ID 20171027002321.12800-1-michael@niedermayer.cc
State Accepted
Commit 0976752420706c0a8b3cb8fd61497a47c7d7270f
Headers show

Commit Message

Michael Niedermayer Oct. 27, 2017, 12:23 a.m. UTC 
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>
---
 libavcodec/aacdec_fixed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer Oct. 30, 2017, 1:12 p.m. UTC | #1 
On Fri, Oct 27, 2017 at 02:23:20AM +0200, Michael Niedermayer wrote:
> 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>
> ---
>  libavcodec/aacdec_fixed.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

will apply patchset


[...]
diff mbox

Patch

diff --git a/libavcodec/aacdec_fixed.c b/libavcodec/aacdec_fixed.c
index f6a533010f..5e9249ceea 100644
--- a/libavcodec/aacdec_fixed.c
+++ b/libavcodec/aacdec_fixed.c
@@ -307,9 +307,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);
         }
     }