Browse Source

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
tags/n2.2-rc1
Anton Khirnov 12 years ago
parent
commit
9eef9eb301
1 changed files with 6 additions and 0 deletions
  1. +6
    -0
      libavcodec/h264.c

+ 6
- 0
libavcodec/h264.c View File

@@ -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) {


Loading…
Cancel
Save