huffyuvdec: check width size for yuv422p
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 2 Aug 2014 23:54:33 +0000 (00:54 +0100)
committerAnton Khirnov <anton@khirnov.net>
Tue, 5 Aug 2014 20:11:08 +0000 (20:11 +0000)
Avoid out of array accesses.

CC: libav-stable@libav.org
Bug-Id: CVE-2013-0848
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>
(cherry picked from commit a7153444df9040bf6ae103e0bbf6104b66f974cb)
Signed-off-by: Anton Khirnov <anton@khirnov.net>
libavcodec/huffyuvdec.c

index f471b28..18e4c87 100644 (file)
@@ -341,6 +341,13 @@ static av_cold int decode_init(AVCodecContext *avctx)
         return AVERROR_INVALIDDATA;
     }
 
+    if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P &&
+        avctx->width % 4) {
+        av_log(avctx, AV_LOG_ERROR, "width must be multiple of 4 "
+               "for this combination of colorspace and predictor type.\n");
+        return AVERROR_INVALIDDATA;
+    }
+
     if ((ret = ff_huffyuv_alloc_temp(s)) < 0)
         return ret;