diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-12-14 21:01:59 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2014-12-20 11:16:27 +0100 |
| commit | fc159ba88ea2dd1fa11e4ab6af8b574fc80db454 (patch) | |
| tree | 3728dbcec6d743e67b6bae66f5b1950849f1a3e4 | |
| parent | 954aafaa961c32c655ad38fb622e8cbe249ebd5a (diff) | |
| download | ffmpeg-fc159ba88ea2dd1fa11e4ab6af8b574fc80db454.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
(cherry picked from commit 17ba719d9ba30c970f65747f42d5fbb1e447ca28)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 69a930b988ff4f88ae27e4fc24ff6ed116840b5e)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit 3f10a779b465fd22d3aec1b744ca8544bc2da970)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
Conflicts:
libavcodec/mmvideo.c
(cherry picked from commit 03dba25a4001495226651068232b4c6b1e75fd02)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
| -rw-r--r-- | libavcodec/mmvideo.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 660cebc58f..269813214c 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -60,6 +60,13 @@ static av_cold int mm_decode_init(AVCodecContext *avctx) avctx->pix_fmt = 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.reference = 1; return 0; |