diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-02-05 00:12:08 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-02-17 19:43:18 +0100 |
| commit | bd9c755b22ff84a5d08dd065cdfd3faeceea690a (patch) | |
| tree | 6ba88b767fface02c33ca50866ce6790cbf8898a | |
| parent | 4c246c65bfa221c45452923cf148f7b11245b6d5 (diff) | |
| download | ffmpeg-bd9c755b22ff84a5d08dd065cdfd3faeceea690a.tar.gz | |
swscale/utils: Limit filter shifting so as not to read from prior the array
Fixes out of array read
Fixes: asan_heap-oob_1fb2f9b_3780_cov_3984375136_usf.mkv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 692b22626ec9a9585f667c124a186b1a9796e432)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libswscale/utils.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c index fb4576a626..9db6af6e4f 100644 --- a/libswscale/utils.c +++ b/libswscale/utils.c @@ -618,14 +618,15 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos, } if ((*filterPos)[i] + filterSize > srcW) { - int shift = (*filterPos)[i] + filterSize - srcW; + int shift = (*filterPos)[i] + FFMIN(filterSize - srcW, 0); + // move filter coefficients right to compensate for filterPos for (j = filterSize - 2; j >= 0; j--) { int right = FFMIN(j + shift, filterSize - 1); filter[i * filterSize + right] += filter[i * filterSize + j]; filter[i * filterSize + j] = 0; } - (*filterPos)[i]= srcW - filterSize; + (*filterPos)[i]-= shift; } } |