diff mbox

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

Message ID 20170727214927.22553-1-michael@niedermayer.cc
State Accepted
Commit 2c630d159ffe8a9822e81f9c041652762b37e068
Headers show

Commit Message

Michael Niedermayer July 27, 2017, 9:49 p.m. UTC
Fixes: runtime error: signed integer overflow: -536870912 - 1972191120 cannot be represented in type 'int'
Fixes: 2711/clusterfuzz-testcase-minimized-4975142398590976

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

Comments

Michael Niedermayer July 29, 2017, 2:01 a.m. UTC | #1
On Thu, Jul 27, 2017 at 11:49:26PM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: signed integer overflow: -536870912 - 1972191120 cannot be represented in type 'int'
> Fixes: 2711/clusterfuzz-testcase-minimized-4975142398590976
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/takdec.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

patchset applied

[...]
diff mbox

Patch

diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
index e555482b23..1676313b7c 100644
--- a/libavcodec/takdec.c
+++ b/libavcodec/takdec.c
@@ -491,7 +491,7 @@  static int decode_subframe(TAKDecContext *s, int32_t *decoded,
                      s->residues[i + j + 1] * s->filter[j + 1] +
                      s->residues[i + j    ] * s->filter[j    ];
             }
-            v = (av_clip_intp2(v >> filter_quant, 13) * (1 << dshift)) - *decoded;
+            v = (av_clip_intp2(v >> filter_quant, 13) * (1 << dshift)) - (unsigned)*decoded;
             *decoded++ = v;
             s->residues[filter_order + i] = v >> dshift;
         }