diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2019-05-22 02:01:33 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2019-06-05 13:19:59 +0200 |
| commit | a99ffb5bb4454c625748972d9389cfaa5433a342 (patch) | |
| tree | 172d10b35dc012d6ecec49b87ac388b1115b1fb2 /libavcodec/diracdec.c | |
| parent | 0a2b768d3ecca32d496da1393406bebcab7680e2 (diff) | |
| download | ffmpeg-streaming-a99ffb5bb4454c625748972d9389cfaa5433a342.zip ffmpeg-streaming-a99ffb5bb4454c625748972d9389cfaa5433a342.tar.gz | |
avcodec/diracdec: Fix integer overflow in global_mv()
Fixes: signed integer overflow: 16384 * 196607 cannot be represented in type 'int'
Fixes: 14810/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_DIRAC_fuzzer-5091232683917312
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/diracdec.c')
| -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 52a1951..7b9e009 100644 --- a/libavcodec/diracdec.c +++ b/libavcodec/diracdec.c @@ -1433,8 +1433,8 @@ static void global_mv(DiracContext *s, DiracBlock *block, int x, int y, int ref) int *c = s->globalmc[ref].perspective; 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]); + int64_t mx = m * (int64_t)((A[0][0] * (int64_t)x + A[0][1]*(int64_t)y) + (1LL<<ez) * b[0]); + int64_t my = m * (int64_t)((A[1][0] * (int64_t)x + A[1][1]*(int64_t)y) + (1LL<<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); |
