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

avcodec/truemotion1: Fix multiple runtime error: left shift of negative value -1 

Fixes: 1446/clusterfuzz-testcase-minimized-5577409124368384

Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/targets/ffmpeg
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2017-05-10 19:09:31 +02:00
parent a8de60ba27
commit db5fae3229
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/truemotion1.c
View File

@ -177,10 +177,10 @@ static int make_ydt15_entry(int p1, int p2, int16_t *ydt)
int lo, hi;
lo = ydt[p1];
lo += (lo << 5) + (lo << 10);
lo += (lo * 32) + (lo * 1024);
hi = ydt[p2];
hi += (hi << 5) + (hi << 10);
return (lo + (hi << 16)) << 1;
hi += (hi * 32) + (hi * 1024);
return (lo + (hi * (1 << 16))) * 2;
}
static int make_cdt15_entry(int p1, int p2, int16_t *cdt)
@ -188,9 +188,9 @@ static int make_cdt15_entry(int p1, int p2, int16_t *cdt)
int r, b, lo;
b = cdt[p2];
r = cdt[p1] << 10;
r = cdt[p1] * 1024;
lo = b + r;
return (lo + (lo << 16)) << 1;
return (lo + (lo * (1 << 16))) * 2;
}
#if HAVE_BIGENDIAN