har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

avcodec/h264_slice: Fix container cropping

Browse Source 
Fixes out of array read
Fixes: asan_heap-oob_394322e_138_cov_4265020547_CVPCMNL1_SVA_C.264

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-07-08 17:49:00 +02:00
parent 80e42387dc
commit 3c63d06d81
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/h264_slice.c
View File

@ -980,7 +980,10 @@ static int init_dimensions(H264Context *h)
/* handle container cropping */ /* handle container cropping */
if (FFALIGN(h->avctx->width, 16) == FFALIGN(width, 16) && if (FFALIGN(h->avctx->width, 16) == FFALIGN(width, 16) &&
FFALIGN(h->avctx->height, 16) == FFALIGN(height, 16)) { FFALIGN(h->avctx->height, 16) == FFALIGN(height, 16) &&
h->avctx->width <= width &&
h->avctx->height <= height
) {
width = h->avctx->width; width = h->avctx->width;
height = h->avctx->height; height = h->avctx->height;
} }