From 9eef9eb3014b2ed9c3ff4aac510a9f04edb555cf Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Thu, 28 Nov 2013 10:54:35 +0100 Subject: [PATCH] h264: check that execute_decode_slices() is not called too many times Fixes invalid reads. Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC:libav-stable@libav.org --- libavcodec/h264.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index c0dfa3d638..7d49d4877d 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -4495,6 +4495,12 @@ static int execute_decode_slices(H264Context *h, int context_count) H264Context *hx; int i; + if (h->mb_y >= h->mb_height) { + av_log(h->avctx, AV_LOG_ERROR, + "Input contains more MB rows than the frame height.\n"); + return AVERROR_INVALIDDATA; + } + if (h->avctx->hwaccel) return 0; if (context_count == 1) {