Commit 6755eb5b authored by Anton Khirnov's avatar Anton Khirnov

mss12: validate display dimensions

The code currently reads the coded dimensions from the extradata, but
expects the display dimensions to be set by the caller, and does not
check that they are compatible (i.e. that the displayed size is smaller
than the coded size).

Make sure that when the display dimensions are set, they are also valid.
Fixes possible invalid memory access.

CC: libav-stable@libav.org
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
parent 33f10546
......@@ -588,6 +588,16 @@ av_cold int ff_mss12_decode_init(MSS12Context *c, int version,
avctx->coded_width, avctx->coded_height);
return AVERROR_INVALIDDATA;
}
if (avctx->width || avctx->height) {
if (avctx->width <= 0 || avctx->width > avctx->coded_width ||
avctx->height <= 0 || avctx->height > avctx->coded_height) {
av_log(avctx, AV_LOG_ERROR, "Invalid display dimensions\n");
return AVERROR_INVALIDDATA;
}
} else {
avctx->width = avctx->coded_width;
avctx->height = avctx->coded_height;
}
av_log(avctx, AV_LOG_DEBUG, "Encoder version %"PRIu32".%"PRIu32"\n",
AV_RB32(avctx->extradata + 4), AV_RB32(avctx->extradata + 8));
......
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