diff mbox

[FFmpeg-devel,2/2] avcodec/diracdsp: fix integer overflow

Message ID 20170729142752.23098-2-michael@niedermayer.cc
State Accepted
Commit b2d9d7226943d6229a17e31714ce5162bdf88b33
Headers show

Commit Message

Michael Niedermayer July 29, 2017, 2:27 p.m. UTC
Fixes: runtime error: signed integer overflow: 11 * 225726413 cannot be represented in type 'int'
Fixes: 2764/clusterfuzz-testcase-minimized-5382561922547712

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

Comments

Michael Niedermayer Aug. 1, 2017, 11:37 a.m. UTC | #1
On Sat, Jul 29, 2017 at 04:27:52PM +0200, Michael Niedermayer wrote:
> Fixes: runtime error: signed integer overflow: 11 * 225726413 cannot be represented in type 'int'
> Fixes: 2764/clusterfuzz-testcase-minimized-5382561922547712
> 
> Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/diracdsp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

patchset applied

[...]
diff mbox

Patch

diff --git a/libavcodec/diracdsp.c b/libavcodec/diracdsp.c
index cd1209e209..8bc79b788c 100644
--- a/libavcodec/diracdsp.c
+++ b/libavcodec/diracdsp.c
@@ -199,7 +199,7 @@  static void dequant_subband_ ## PX ## _c(uint8_t *src, uint8_t *dst, ptrdiff_t s
         for (i = 0; i < tot_h; i++) {                                                      \
             c = *src_r++;                                                                  \
             sign = FFSIGN(c)*(!!c);                                                        \
-            c = (FFABS(c)*qf + qs) >> 2;                                                   \
+            c = (FFABS(c)*(unsigned)qf + qs) >> 2;                                                   \
             *dst_r++ = c*sign;                                                             \
         }                                                                                  \
         src += tot_h << (sizeof(PX) >> 1);                                                 \