summaryrefslogtreecommitdiff
path: root/libavcodec/mv30.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2020-05-23 21:52:25 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2020-06-04 23:58:49 +0200
commit7f817853cd05597a00361c0931048c4fb72042e3 (patch)
tree3c57329b5ac5aeba947c34dc4cafebd9578a7f1f /libavcodec/mv30.c
parente73a25168028fea7ca8a837519c6643875c09cab (diff)
avcodec/mv30: Fix multiple integer overflows in idct_1d()
Fixes: signed integer overflow: -4869937 * 473 cannot be represented in type 'int' Fixes: 21934/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_MV30_fuzzer-5667289925156864 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/mv30.c')
-rw-r--r--libavcodec/mv30.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/libavcodec/mv30.c b/libavcodec/mv30.c
index 658f32c6ff..013a5753fe 100644
--- a/libavcodec/mv30.c
+++ b/libavcodec/mv30.c
@@ -107,7 +107,7 @@ static inline void idct_1d(int *blk, int step)
const int t0 = blk[0 * step] + blk[4 * step];
const int t1 = blk[0 * step] - blk[4 * step];
const int t2 = blk[2 * step] + blk[6 * step];
- const int t3 = (((blk[2 * step] - blk[6 * step]) * 362) >> 8) - t2;
+ const int t3 = ((int)((blk[2 * step] - blk[6 * step]) * 362U) >> 8) - t2;
const int t4 = t0 + t2;
const int t5 = t0 - t2;
const int t6 = t1 + t3;
@@ -117,10 +117,10 @@ static inline void idct_1d(int *blk, int step)
const int tA = blk[1 * step] + blk[7 * step];
const int tB = blk[1 * step] - blk[7 * step];
const int tC = t8 + tA;
- const int tD = (tB + t9) * 473 >> 8;
- const int tE = ((t9 * -669 >> 8) - tC) + tD;
- const int tF = ((tA - t8) * 362 >> 8) - tE;
- const int t10 = ((tB * 277 >> 8) - tD) + tF;
+ const int tD = (int)((tB + t9) * 473U) >> 8;
+ const int tE = (((int)(t9 * -669U) >> 8) - tC) + tD;
+ const int tF = ((int)((tA - t8) * 362U) >> 8) - tE;
+ const int t10 = (((int)(tB * 277U) >> 8) - tD) + tF;
blk[0 * step] = t4 + tC;
blk[1 * step] = t6 + tE;