summaryrefslogtreecommitdiff
path: root/libavcodec/mmvideo.c
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-12-14 21:01:59 +0100
committerAnton Khirnov <anton@khirnov.net>2014-12-19 08:01:46 +0100
commit17ba719d9ba30c970f65747f42d5fbb1e447ca28 (patch)
tree5ace948f9709f95d1c52cdd4e80813ddfcdc615b /libavcodec/mmvideo.c
parent88626e5af8d006e67189bf10b96b982502a7e8ad (diff)
downloadffmpeg-17ba719d9ba30c970f65747f42d5fbb1e447ca28.tar.gz
mmvideo: check frame dimensions
The frame size must be set by the caller and each dimension must be a multiple of 2. CC: libav-stable@libav.org Bug-ID: CVE-2014-8543 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Diffstat (limited to 'libavcodec/mmvideo.c')
-rw-r--r--libavcodec/mmvideo.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c
index d80c832a31..25124a3edf 100644
--- a/libavcodec/mmvideo.c
+++ b/libavcodec/mmvideo.c
@@ -61,6 +61,13 @@ static av_cold int mm_decode_init(AVCodecContext *avctx)
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();
if (!s->frame)
return AVERROR(ENOMEM);