Commit 43bacd5b authored by Luca Barbato's avatar Luca Barbato

vc1: check mb_height validity.

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
parent 090cd063
...@@ -5966,6 +5966,12 @@ static int vc1_decode_frame(AVCodecContext *avctx, void *data, ...@@ -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) {
......
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