summaryrefslogtreecommitdiffstats
path: root/libswscale
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-24 00:32:39 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-02-24 01:00:24 +0100
commit1895d414aaacece3b57d7bf19502305e9a064fae (patch)
tree5b42354f481aef513df47a89fd93025dfc6b5f8e /libswscale
parent4d1b017c380e3794cd938009faab356390cbe0ad (diff)
downloadffmpeg-streaming-1895d414aaacece3b57d7bf19502305e9a064fae.zip
ffmpeg-streaming-1895d414aaacece3b57d7bf19502305e9a064fae.tar.gz
swscale/utils: More carefully merge and clear coefficients outside the input
Fixes out of array read Fixes: asan_heap-oob_35ca682_1474_cov_3230122439_aletrek_tga_16bit.mov 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.c20
1 files changed, 15 insertions, 5 deletions
diff --git a/libswscale/utils.c b/libswscale/utils.c
index c09d37d..b63ab19 100644
--- a/libswscale/utils.c
+++ b/libswscale/utils.c
@@ -612,14 +612,24 @@ static av_cold int initFilter(int16_t **outFilter, int32_t **filterPos,
if ((*filterPos)[i] + filterSize > srcW) {
int shift = (*filterPos)[i] + FFMIN(filterSize - srcW, 0);
+ int64_t acc = 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;
+ for (j = filterSize - 1; j >= 0; j--) {
+ if ((*filterPos)[i] + j >= srcW) {
+ acc += filter[i * filterSize + j];
+ filter[i * filterSize + j] = 0;
+ }
}
+ for (j = filterSize - 1; j >= 0; j--) {
+ if (j < shift) {
+ filter[i * filterSize + j] = 0;
+ } else {
+ filter[i * filterSize + j] = filter[i * filterSize + j - shift];
+ }
+ }
+
(*filterPos)[i]-= shift;
+ filter[i * filterSize + srcW - 1 - (*filterPos)[i]] += acc;
}
}
OpenPOWER on IntegriCloud