diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:04:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-19 13:05:49 +0100 |
| commit | 6c7b153d97b5e283d3a06096dc9b3b64ed756fdb (patch) | |
| tree | b5f00c429510d4bcf2e382fd44a8954447bdfd2c /libavcodec | |
| parent | f346e37aa27475b4d2153f3606c7d47847854de3 (diff) | |
| parent | 17ba719d9ba30c970f65747f42d5fbb1e447ca28 (diff) | |
| download | ffmpeg-6c7b153d97b5e283d3a06096dc9b3b64ed756fdb.tar.gz | |
Merge commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28'
* commit '17ba719d9ba30c970f65747f42d5fbb1e447ca28':
mmvideo: check frame dimensions
See: 8b0e96e1f21b761ca15dbb470cd619a1ebf86c3e
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 9a7c10c3ab..8b04965d59 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); |