diff options
| author | Anton Khirnov <anton@khirnov.net> | 2014-12-14 21:01:59 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-30 15:38:21 +0100 |
| commit | 01c83f4cb197ba9e2317ea4e4ade4cf46e138113 (patch) | |
| tree | a8a9b89d3e362037e44e28d99e03aabf8c12de8a | |
| parent | d3853ad11f216cb57edf7b1f2bfbc49449fb8f65 (diff) | |
| download | ffmpeg-01c83f4cb197ba9e2317ea4e4ade4cf46e138113.tar.gz | |
jvdec: check frame dimensions
The frame size must be set by the caller and each dimension must be a
multiple of 8.
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
See: 105654e376a736d243aef4a1d121abebce912e6b
These should be redundant, but are backported for saftey anyway
(cherry picked from commit e012cb8dea7969c7b3927dbf846ef2742cd4a7ab)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/jvdec.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index cad053289a..7c0a42b04e 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -42,6 +42,13 @@ static av_cold int decode_init(AVCodecContext *avctx) { JvContext *s = avctx->priv_data; + if (!avctx->width || !avctx->height || + (avctx->width & 7) || (avctx->height & 7)) { + 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); |