Commit 3c63d06d authored by Michael Niedermayer's avatar Michael Niedermayer

avcodec/h264_slice: Fix container cropping

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: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 80e42387
......@@ -980,7 +980,10 @@ static int init_dimensions(H264Context *h)
/* handle container cropping */
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;
height = h->avctx->height;
}
......
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