diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-11 08:42:28 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2012-02-11 10:06:50 -0800 |
| commit | dae2ce361a2b5fd9be1d43e5e8c00bdbc5f03e3d (patch) | |
| tree | 79129d6d2205b244c136adad4923d176cd758a38 /libswscale | |
| parent | 764852d6531016491a19d73d31e619887890f04d (diff) | |
| download | ffmpeg-dae2ce361a2b5fd9be1d43e5e8c00bdbc5f03e3d.tar.gz | |
swscale: enforce a minimum filtersize.
At very small dimensions, this calculation could lead to zero-sized
filters, which leads to uninitialized output, zero-sized allocations,
loop overflows in SIMD that uses do{..}while(i++<filtersize); instead
of for(i=0;i<filtersize;i++){..} and several other similar failures.
Therefore, require a minimum filtersize of 1.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index 15039ce1f0..2fe9c5b47f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -263,7 +263,7 @@ static int initFilter(int16_t **outFilter, int16_t **filterPos, int *outFilterSi if (xInc <= 1<<16) filterSize= 1 + sizeFactor; // upscale else filterSize= 1 + (sizeFactor*srcW + dstW - 1)/ dstW; - if (filterSize > srcW-2) filterSize=srcW-2; + filterSize = av_clip(filterSize, 1, srcW - 2); FF_ALLOC_OR_GOTO(NULL, filter, dstW*sizeof(*filter)*filterSize, fail); |