1. ffmpeg
  2. Commit 1d9830cba30dfa1ff44f5227763e9d5257841854
Browse code

avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD97iH0() and COMPOSE_DD137iL0()

Fixes: runtime error: signed integer overflow: 2147483646 + 33554433 cannot be represented in type 'int'
Fixes: 4563/clusterfuzz-testcase-minimized-5438979567517696

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 4d70fbeec8cbab072b3a9b9f760b8deaaef240f2)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

Michael Niedermayer authored on 2017/12/22 11:06:14
Showing 1 changed files
libavcodec/dirac_dwt.h
History View file @ 1d9830c
... ... 
@@ -99,10 +99,10 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
99 99 
     (b1 + ((int)(b0 + (unsigned)(b2) + 1) >> 1))
100 100
101 101 
 #define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\
102 
-    (b2 + ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 8) >> 4))
102 
+    (int)(((unsigned)(b2) + ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 8) >> 4)))
103 103
104 104 
 #define COMPOSE_DD137iL0(b0, b1, b2, b3, b4)\
105 
-    (b2 - ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 16) >> 5))
105 
+    (int)(((unsigned)(b2) - ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 16) >> 5)))
106 106
107 107 
 #define COMPOSE_HAARiL0(b0, b1)\
108 108 
     (b0 - ((b1 + 1) >> 1))