diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-04-07 16:44:53 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-11-14 23:30:37 +0100 |
| commit | 76f6712057e1e6ad0f9f2a8e4f83c4656e24e81e (patch) | |
| tree | f599426ef8d4c5fa4c5908c242c080c3e9c50d91 | |
| parent | 12a6305799d8768fa88daf1e3fa294abb19024d6 (diff) | |
| download | ffmpeg-76f6712057e1e6ad0f9f2a8e4f83c4656e24e81e.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 67aaf1f0c3..7ae795a928 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1408,7 +1408,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]); |