[SCM] libav/experimental: huffyuvdec: check width size for yuv422p

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit a7153444df9040bf6ae103e0bbf6104b66f974cb
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sun Aug 3 00:54:33 2014 +0100

    huffyuvdec: check width size for yuv422p
    
    Avoid out of array accesses.
    
    CC: libav-stable at libav.org
    Bug-Id: CVE-2013-0848
    Signed-off-by: Vittorio Giovara <vittorio.giovara at gmail.com>
    Signed-off-by: Anton Khirnov <anton at khirnov.net>

diff --git a/libavcodec/huffyuvdec.c b/libavcodec/huffyuvdec.c
index dc99d19..d8f31d3 100644
--- a/libavcodec/huffyuvdec.c
+++ b/libavcodec/huffyuvdec.c
@@ -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;
 

-- 
Libav/FFmpeg packaging