diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-07 16:44:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-27 17:50:47 +0200 |
| commit | fb3135ae97948c9dab2b68cfe8a59f35f1e7d287 (patch) | |
| tree | e173dc6eb927fdea939135f76c1a16fa7a05f92d | |
| parent | 6a0895bdf30821ca05516040c13addc770453ef9 (diff) | |
| download | ffmpeg-fb3135ae97948c9dab2b68cfe8a59f35f1e7d287.tar.gz | |
avcodec/diracdec: Use 64bit in intermediate of global motion vector field generation
It seems the specification does not limit the value to 32bit
Fixes: signed integer overflow: -109611143 * 24 cannot be represented in type 'int'
Fixes: 13477/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5648337460527104
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 837820f385af699f9bee5e2ba3169dda15e5894d)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/diracdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c index fd23139062..0216cf2650 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1427,7 +1427,7 @@ static void global_mv(DiracContext *s, DiracBlock *block, int x, int y, int ref) int *b = s->globalmc[ref].pan_tilt; int *c = s->globalmc[ref].perspective; - int m = (1<<ep) - (c[0]*x + c[1]*y); + int64_t m = (1<<ep) - (c[0]*(int64_t)x + c[1]*(int64_t)y); int64_t mx = m * (int64_t)((A[0][0] * (int64_t)x + A[0][1]*(int64_t)y) + (1<<ez) * b[0]); int64_t my = m * (int64_t)((A[1][0] * (int64_t)x + A[1][1]*(int64_t)y) + (1<<ez) * b[1]); |