Browse Source

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 837820f385)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
tags/n4.1.4
Michael Niedermayer 6 years ago
parent
commit
fb3135ae97
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavcodec/diracdec.c

+ 1
- 1
libavcodec/diracdec.c View File

@@ -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]);



Loading…
Cancel
Save