RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/truemotion2: Fix multiple integer overflows in tm2_null_res_block() 

Fixes: signed integer overflow: 1795032576 + 598344192 cannot be represented in type 'int'
Fixes: 16196/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_TRUEMOTION2_fuzzer-5636723419119616

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit cc78783ce5)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2019-08-15 23:22:50 +02:00
parent ba7ba6db74
commit 372c91b199
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/truemotion2.c
View File

@ -619,7 +619,7 @@ static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int
ct = ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3]; ct = ctx->D[0] + ctx->D[1] + ctx->D[2] + ctx->D[3];
if (bx > 0) if (bx > 0)
left = last[-1] - ct; left = last[-1] - (unsigned)ct;
else else
left = 0; left = 0;
@ -630,7 +630,7 @@ static inline void tm2_null_res_block(TM2Context *ctx, AVFrame *pic, int bx, int
last[2] = right - (diff >> 2); last[2] = right - (diff >> 2);
last[3] = right; last[3] = right;
{ {
int tp = left; unsigned tp = left;
ctx->D[0] = (tp + (ct >> 2)) - left; ctx->D[0] = (tp + (ct >> 2)) - left;
left += ctx->D[0]; left += ctx->D[0];