[FFmpeg-cvslog] avcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 cannot be represented in type 'int'
Michael Niedermayer
git at videolan.org
Fri Jun 2 03:04:49 EEST 2017
ffmpeg | branch: release/3.3 | Michael Niedermayer <michael at niedermayer.cc> | Thu May 18 17:13:18 2017 +0200| [f254c7ea1397f157c8035748a646edf8f5818625] | committer: Michael Niedermayer
avcodec/fic: Fix multiple runtime error: signed integer overflow: 5793 * 419752 cannot be represented in type 'int'
Fixes: 1669/clusterfuzz-testcase-minimized-5287529198649344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
(cherry picked from commit a173f484b52ed63292439de5347e49bd78cad0ed)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f254c7ea1397f157c8035748a646edf8f5818625
---
libavcodec/fic.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/libavcodec/fic.c b/libavcodec/fic.c
index 3805f70722..f19b5d4974 100644
--- a/libavcodec/fic.c
+++ b/libavcodec/fic.c
@@ -89,22 +89,22 @@ static av_always_inline void fic_idct(int16_t *blk, int step, int shift, int rnd
const int t1 = 27246 * blk[5 * step] - 18405 * blk[3 * step];
const int t2 = 6393 * blk[7 * step] + 32139 * blk[1 * step];
const int t3 = 6393 * blk[1 * step] - 32139 * blk[7 * step];
- const int t4 = 5793 * (t2 + t0 + 0x800 >> 12);
- const int t5 = 5793 * (t3 + t1 + 0x800 >> 12);
- const int t6 = t2 - t0;
- const int t7 = t3 - t1;
- const int t8 = 17734 * blk[2 * step] - 42813 * blk[6 * step];
- const int t9 = 17734 * blk[6 * step] + 42814 * blk[2 * step];
- const int tA = (blk[0 * step] - blk[4 * step]) * 32768 + rnd;
- const int tB = (blk[0 * step] + blk[4 * step]) * 32768 + rnd;
- blk[0 * step] = ( t4 + t9 + tB) >> shift;
- blk[1 * step] = ( t6 + t7 + t8 + tA) >> shift;
- blk[2 * step] = ( t6 - t7 - t8 + tA) >> shift;
- blk[3 * step] = ( t5 - t9 + tB) >> shift;
- blk[4 * step] = ( -t5 - t9 + tB) >> shift;
- blk[5 * step] = (-(t6 - t7) - t8 + tA) >> shift;
- blk[6 * step] = (-(t6 + t7) + t8 + tA) >> shift;
- blk[7 * step] = ( -t4 + t9 + tB) >> shift;
+ const unsigned t4 = 5793U * (t2 + t0 + 0x800 >> 12);
+ const unsigned t5 = 5793U * (t3 + t1 + 0x800 >> 12);
+ const unsigned t6 = t2 - t0;
+ const unsigned t7 = t3 - t1;
+ const unsigned t8 = 17734 * blk[2 * step] - 42813 * blk[6 * step];
+ const unsigned t9 = 17734 * blk[6 * step] + 42814 * blk[2 * step];
+ const unsigned tA = (blk[0 * step] - blk[4 * step]) * 32768 + rnd;
+ const unsigned tB = (blk[0 * step] + blk[4 * step]) * 32768 + rnd;
+ blk[0 * step] = (int)( t4 + t9 + tB) >> shift;
+ blk[1 * step] = (int)( t6 + t7 + t8 + tA) >> shift;
+ blk[2 * step] = (int)( t6 - t7 - t8 + tA) >> shift;
+ blk[3 * step] = (int)( t5 - t9 + tB) >> shift;
+ blk[4 * step] = (int)( -t5 - t9 + tB) >> shift;
+ blk[5 * step] = (int)(-(t6 - t7) - t8 + tA) >> shift;
+ blk[6 * step] = (int)(-(t6 + t7) + t8 + tA) >> shift;
+ blk[7 * step] = (int)( -t4 + t9 + tB) >> shift;
}
static void fic_idct_put(uint8_t *dst, int stride, int16_t *block)
More information about the ffmpeg-cvslog
mailing list