summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-05 00:12:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-05 00:33:50 +0100
commit692b22626ec9a9585f667c124a186b1a9796e432 (patch)
tree0af9b5593c6b334bfcf81a6cd54f36f6763b3ff7 /libswscale
parentfd52d2d3d1ee41822a9801dffd41c0e1a2db32a8 (diff)
downloadffmpeg-streaming-692b22626ec9a9585f667c124a186b1a9796e432.zip
ffmpeg-streaming-692b22626ec9a9585f667c124a186b1a9796e432.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>
Diffstat (limited to 'libswscale')
-rw-r--r--libswscale/utils.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index d2ad20e..2174262 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -611,14 +611,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;
}
}
OpenPOWER on IntegriCloud