MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mjpegdec: Fix small picture upscale

Browse Source 
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: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-06-30 01:19:30 +02:00
parent b54ac8403b
commit 84afc6b70d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/mjpegdec.c
View File

@ -2195,11 +2195,13 @@ the_end:
}
} else if (s->upscale_h[p] == 2) {
if (is16bit) {
((uint16_t*)line)[w - 1] =
((uint16_t*)line)[w - 2] = ((uint16_t*)line)[(w - 1) / 3];
((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 3];
if (w > 1)
((uint16_t*)line)[w - 2] = ((uint16_t*)line)[w - 1];
} else {
line[w - 1] =
line[w - 2] = line[(w - 1) / 3];
line[w - 1] = line[(w - 1) / 3];
if (w > 1)
line[w - 2] = line[w - 1];
}
for (index = w - 3; index > 0; index--) {
line[index] = (line[index / 3] + line[(index + 1) / 3] + line[(index + 2) / 3] + 1) / 3;