summaryrefslogtreecommitdiff
path: root/libavcodec/dirac_dwt.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2017-07-28 03:22:40 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2017-07-29 16:28:22 +0200
commitbf8ab72ae95bb11f2c281d464594c2f6ba70326b (patch)
treee9a1a532341266d10cc916e0c2596fbcd10df6f1 /libavcodec/dirac_dwt.h
parentc0220c768c7fc933a76c863ebbb0abdf68a88533 (diff)
avcodec/dirac_dwt: Fix multiple integer overflows in COMPOSE_DD97iH0()
Fixes: runtime error: signed integer overflow: 9 * 335544320 cannot be represented in type 'int' Fixes: 2739/clusterfuzz-testcase-minimized-6737297955356672 Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/dirac_dwt.h')
-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 4d338651fa..62f8472b41 100644
--- a/libavcodec/dirac_dwt.h
+++ b/libavcodec/dirac_dwt.h
@@ -99,7 +99,7 @@ void ff_spatial_idwt_slice2(DWTContext *d, int y);
(b1 + ((b0 + b2 + 1) >> 1))
#define COMPOSE_DD97iH0(b0, b1, b2, b3, b4)\
- (b2 + ((-b0 + 9*b1 + 9*b3 - b4 + 8) >> 4))
+ (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))