1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

vc1: check mb_height validity.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2013-08-05 06:30:24 +02:00
parent 090cd06311
commit 43bacd5b7d

View File

@ -5966,6 +5966,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data,
s->uvlinesize <<= 1; s->uvlinesize <<= 1;
} }
mb_height = s->mb_height >> v->field_mode; mb_height = s->mb_height >> v->field_mode;
if (!mb_height) {
av_log(v->s.avctx, AV_LOG_ERROR, "Invalid mb_height.\n");
goto err;
}
for (i = 0; i <= n_slices; i++) { for (i = 0; i <= n_slices; i++) {
if (i > 0 && slices[i - 1].mby_start >= mb_height) { if (i > 0 && slices[i - 1].mby_start >= mb_height) {
if (v->field_mode <= 0) { if (v->field_mode <= 0) {