diff mbox

[FFmpeg-devel,2/3] avcodec/sbrdsp_fixed: Fix integer overflow in sbr_hf_apply_noise()

Message ID 20170702022856.16195-2-michael@niedermayer.cc
State Accepted
Commit 2061de8a3f73f14806e5f6ccaf9a635f740a54e6
Headers show

Commit Message

Michael Niedermayer July 2, 2017, 2:28 a.m. UTC 
Fixes: runtime error: signed integer overflow: -2049425300 + -117591631 cannot be represented in type 'int'
Fixes: part of 2096/clusterfuzz-testcase-minimized-4901566068817920

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/sbrdsp_fixed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Niedermayer July 8, 2017, 9:18 p.m. UTC | #1 
On Sun, Jul 02, 2017 at 04:28:55AM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: signed integer overflow: -2049425300 + -117591631 cannot be represented in type 'int'
> Fixes: part of 2096/clusterfuzz-testcase-minimized-4901566068817920
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/sbrdsp_fixed.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Will apply this patch of the patchset

[...]
diff mbox

Patch

diff --git a/libavcodec/sbrdsp_fixed.c b/libavcodec/sbrdsp_fixed.c
index 218bb1acd8..fe48104021 100644
--- a/libavcodec/sbrdsp_fixed.c
+++ b/libavcodec/sbrdsp_fixed.c
@@ -264,8 +264,8 @@  static av_always_inline int sbr_hf_apply_noise(int (*Y)[2],
     int m;
 
     for (m = 0; m < m_max; m++) {
-        int y0 = Y[m][0];
-        int y1 = Y[m][1];
+        unsigned y0 = Y[m][0];
+        unsigned y1 = Y[m][1];
         noise = (noise + 1) & 0x1ff;
         if (s_m[m].mant) {
             int shift, round;