Commit 84afc6b7 authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/mjpegdec: Fix small picture upscale

Fixes out of array access

Fixes: asan_heap-oob_1dd60fd_267_cov_2954683513_5baad44ca4702949724234e35c5bb341.jpg

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b54ac840
...@@ -2195,11 +2195,13 @@ the_end: ...@@ -2195,11 +2195,13 @@ the_end:
} }
} else if (s->upscale_h[p] == 2) { } else if (s->upscale_h[p] == 2) {
if (is16bit) { if (is16bit) {
((uint16_t*)line)[w - 1] = ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 3];
((uint16_t*)line)[w - 2] = ((uint16_t*)line)[(w - 1) / 3]; if (w > 1)
((uint16_t*)line)[w - 2] = ((uint16_t*)line)[w - 1];
} else { } else {
line[w - 1] = line[w - 1] = line[(w - 1) / 3];
line[w - 2] = line[(w - 1) / 3]; if (w > 1)
line[w - 2] = line[w - 1];
} }
for (index = w - 3; index > 0; index--) { for (index = w - 3; index > 0; index--) {
line[index] = (line[index / 3] + line[(index + 1) / 3] + line[(index + 2) / 3] + 1) / 3; line[index] = (line[index / 3] + line[(index + 1) / 3] + line[(index + 2) / 3] + 1) / 3;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment