[FFmpeg-cvslog] 4xm: Reject not a multiple of 16 dimension

[Luca Barbato]

ffmpeg | branch: release/1.1 | Luca Barbato <lu_zero at gentoo.org> | Mon Jul 22 12:44:19 2013 +0200| [f8602ef7176d45521ea82176c9342e9298e119a8] | committer: Luca Barbato

4xm: Reject not a multiple of 16 dimension

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable at libav.org
(cherry picked from commit 2f034f255c49050e894ab9b88087c09ebe249f3f)

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f8602ef7176d45521ea82176c9342e9298e119a8
---

 libavcodec/4xm.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 99e0e2e..cc0361d 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));