Commit 6c7b153d authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '17ba719d'

* commit '17ba719d':
  mmvideo: check frame dimensions

See: 8b0e96e1Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f346e37a 17ba719d
...@@ -61,6 +61,13 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) ...@@ -61,6 +61,13 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
avctx->pix_fmt = AV_PIX_FMT_PAL8; avctx->pix_fmt = AV_PIX_FMT_PAL8;
if (!avctx->width || !avctx->height ||
(avctx->width & 1) || (avctx->height & 1)) {
av_log(avctx, AV_LOG_ERROR, "Invalid video dimensions: %dx%d\n",
avctx->width, avctx->height);
return AVERROR(EINVAL);
}
s->frame = av_frame_alloc(); s->frame = av_frame_alloc();
if (!s->frame) if (!s->frame)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
......
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