highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utvideodec: Handle slice_height being zero

Browse Source 
Fixes out of array accesses.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Bug-Id: CVE-2014-9604
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
This commit is contained in:
Michael Niedermayer
2015-03-04 17:36:14 +00:00
committed by Luca Barbato
parent 7b9cb7b365
commit 0ce3a0f9d9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/utvideodec.c
View File

@@ -213,6 +213,8 @@ static void restore_median(uint8_t *src, int step, int stride,
slice_start = ((slice * height) / slices) & cmask; slice_start = ((slice * height) / slices) & cmask;
slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_height = ((((slice + 1) * height) / slices) & cmask) -
slice_start; slice_start;
if (!slice_height)
continue;
bsrc = src + slice_start * stride; bsrc = src + slice_start * stride;
@@ -269,6 +271,8 @@ static void restore_median_il(uint8_t *src, int step, int stride,
slice_height = ((((slice + 1) * height) / slices) & cmask) - slice_height = ((((slice + 1) * height) / slices) & cmask) -
slice_start; slice_start;
slice_height >>= 1; slice_height >>= 1;
if (!slice_height)
continue;
bsrc = src + slice_start * stride; bsrc = src + slice_start * stride;