Commit 9eef9eb3 authored by Anton Khirnov's avatar Anton Khirnov

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
parent bfd26b7c
......@@ -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) {
......
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