diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-17 23:54:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2018-02-27 19:59:58 +0100 |
| commit | b4135fb335f0ab1f06996233f45610c3dcb85bb7 (patch) | |
| tree | 7601ed3a0f0823979eea64995c81f3611e6be3cc | |
| parent | 876ecfccfb2796906e1017fbad0388c411052c06 (diff) | |
| download | ffmpeg-b4135fb335f0ab1f06996233f45610c3dcb85bb7.tar.gz | |
avcodec/diracdec: Use int64 in global mv to prevent overflow
Fixes: runtime error: signed integer overflow: 361 * -6295541 cannot be represented in type 'int'
Fixes: 5911/clusterfuzz-testcase-minimized-6450382197751808
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 cbcbefdc3b4cbc917d2f8b2dd216fb12121a838b)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/diracdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index 2cdebe8700..033fbe4261 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1315,8 +1315,8 @@ static void global_mv(DiracContext *s, DiracBlock *block, int x, int y, int ref) int *c = s->globalmc[ref].perspective; int m = (1<<ep) - (c[0]*x + c[1]*y); - int mx = m * ((A[0][0] * x + A[0][1]*y) + (1<<ez) * b[0]); - int my = m * ((A[1][0] * x + A[1][1]*y) + (1<<ez) * b[1]); + int64_t mx = m * (int64_t)((A[0][0] * x + A[0][1]*y) + (1<<ez) * b[0]); + int64_t my = m * (int64_t)((A[1][0] * x + A[1][1]*y) + (1<<ez) * b[1]); block->u.mv[ref][0] = (mx + (1<<(ez+ep))) >> (ez+ep); block->u.mv[ref][1] = (my + (1<<(ez+ep))) >> (ez+ep); |