diff options
| author | Michael Niedermayer <[email protected]> | 2018-08-20 20:15:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2018-11-18 02:20:44 +0100 |
| commit | c6b7060137cfdf5536df95bb8e58bd30acc90b89 (patch) | |
| tree | 58714aed1eed05af4c18f9971a47da999afedbce | |
| parent | 5d7bab77de261dd70218ac311a8536b4d42b98e8 (diff) | |
avcodec/snowdec: Fix integer overflow with motion vector residual
Fixes: signed integer overflow: -19818 + -2147483648 cannot be represented in type 'int'
Fixes: 9545/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_SNOW_fuzzer-4928769537081344
Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <[email protected]>
(cherry picked from commit acba153a148782c08f9fd17f0c05b93468f3cbd0)
Signed-off-by: Michael Niedermayer <[email protected]>
| -rw-r--r-- | libavcodec/snowdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/snowdec.c b/libavcodec/snowdec.c index 00fa064102..a9fe91d251 100644 --- a/libavcodec/snowdec.c +++ b/libavcodec/snowdec.c @@ -208,8 +208,8 @@ static int decode_q_branch(SnowContext *s, int level, int x, int y){ return AVERROR_INVALIDDATA; } pred_mv(s, &mx, &my, ref, left, top, tr); - mx+= get_symbol(&s->c, &s->block_state[128 + 32*(mx_context + 16*!!ref)], 1); - my+= get_symbol(&s->c, &s->block_state[128 + 32*(my_context + 16*!!ref)], 1); + mx+= (unsigned)get_symbol(&s->c, &s->block_state[128 + 32*(mx_context + 16*!!ref)], 1); + my+= (unsigned)get_symbol(&s->c, &s->block_state[128 + 32*(my_context + 16*!!ref)], 1); } set_blocks(s, level, x, y, l, cb, cr, mx, my, ref, type); }else{ |