virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

swscale: prevent overflow during initialization

Browse Source 
Signed-off-by: Janne Grunau <janne-libav@jannau.net>
This commit is contained in:
Ronald Bultje 2011-10-18 01:53:04 +00:00 committed by Janne Grunau
parent 6e6003a4d2
commit d1d421cbc0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libswscale/utils.c
View File

@ -271,10 +271,12 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi
floatd= d * (1.0/(1<<30));
if (flags & SWS_BICUBIC) {
#define SQRT_INT64_MAX 0xb504f333
int64_t B= (param[0] != SWS_PARAM_DEFAULT ? param[0] : 0) * (1<<24);
int64_t C= (param[1] != SWS_PARAM_DEFAULT ? param[1] : 0.6) * (1<<24);
int64_t dd = ( d*d)>>30;
int64_t ddd= (dd*d)>>30;
int64_t dd = d > SQRT_INT64_MAX ? ((d >> 1) * d) >> 29 : (d * d) >> 30;
int64_t ddd = d > SQRT_INT64_MAX || dd > SQRT_INT64_MAX ?
((dd >> 2) * d) >> 28 : (dd * d) >> 30;
if (d < 1LL<<30)
coeff = (12*(1<<24)-9*B-6*C)*ddd + (-18*(1<<24)+12*B+6*C)*dd + (6*(1<<24)-2*B)*(1<<30);

2
tests/ref/lavfi/crop_scale
View File

@ -1 +1 @@
crop_scale 0a3d45d58b805b8c47416b9239535f94
crop_scale f8cad857d2b7102fc256532ec9849da7