diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-22 12:44:19 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-08-24 15:13:01 +0200 |
| commit | f8602ef7176d45521ea82176c9342e9298e119a8 (patch) | |
| tree | 70d9db39ca01ef2e7cfa71164d9cc0c089444f45 | |
| parent | a5bdec1c75bab2c35b03d46b4b15ea00d3172e3c (diff) | |
| download | ffmpeg-f8602ef7176d45521ea82176c9342e9298e119a8.tar.gz | |
4xm: Reject not a multiple of 16 dimension
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
(cherry picked from commit 2f034f255c49050e894ab9b88087c09ebe249f3f)
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
| -rw-r--r-- | libavcodec/4xm.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 99e0e2e4da..cc0361dd2e 100644 --- a/libavcodec/4xm.c +++ b/libavcodec/4xm.c @@ -810,6 +810,12 @@ static int decode_frame(AVCodecContext *avctx, void *data, if (buf_size < 20) return AVERROR_INVALIDDATA; + if (avctx->width % 16 || avctx->height % 16) { + av_log(avctx, AV_LOG_ERROR, + "Dimensions non-multiple of 16 are invalid.\n"); + return AVERROR_INVALIDDATA; + } + if (buf_size < AV_RL32(buf + 4) + 8) { av_log(f->avctx, AV_LOG_ERROR, "size mismatch %d %d\n", buf_size, AV_RL32(buf + 4)); |