aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-11-14 03:40:07 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-01-31 22:56:14 +0100
commit813d7f4972333ea6d09c2978cfffc93c4d5e343f (patch)
tree123b60afc7f76e80346681f6db670a290f090a2f
parentee54354fcd8e6de40e43f95fb1ea79f316ceec3e (diff)
downloadffmpeg-813d7f4972333ea6d09c2978cfffc93c4d5e343f.tar.gz
avcodec/dirac_dwt: Fix integer overflow in COMPOSE_DD137iL0()
Fixes: 4035/clusterfuzz-testcase-minimized-6479308925173760 Fixes: runtime error: signed integer overflow: 9 * 402653183 cannot be represented in type 'int' 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 73964680d7bce6d81ddc553a24d73e9a1c9156f9) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/dirac_dwt.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/dirac_dwt.h b/libavcodec/dirac_dwt.h
index 8970a8602a..6992f087f8 100644
--- a/libavcodec/dirac_dwt.h
+++ b/libavcodec/dirac_dwt.h
@@ -93,7 +93,7 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
(b2 + ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 8) >> 4))
#define COMPOSE_DD137iL0(b0, b1, b2, b3, b4)\
- (b2 - ((-b0 + 9*b1 + 9*b3 - b4 + 16) >> 5))
+ (b2 - ((int)(-b0 + 9U*b1 + 9U*b3 - b4 + 16) >> 5))
#define COMPOSE_HAARiL0(b0, b1)\
(b0 - ((b1 + 1) >> 1))