git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/blob

   1 gst-ffmpeg: huffyuvdec: check width more completely, avoid out of array
   2  accesses
   3
   4 Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
   5
   6 Upstream-Status: Backport
   7
   8 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
   9 ---
  10  libavcodec/huffyuv.c |    5 ++++-
  11  1 files changed, 4 insertions(+), 1 deletions(-)
  12
  13 diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
  14 index 6e88114..ca5bcd8 100644
  15 --- a/gst-libs/ext/libav/libavcodec/huffyuv.c
  16 +++ b/gst-libs/ext/libav/libavcodec/huffyuv.c
  17 @@ -526,6 +526,10 @@ s->bgr32=1;
  18          assert(0);
  19      }
  20
  21 +    if (s->predictor == MEDIAN && avctx->pix_fmt == AV_PIX_FMT_YUV422P && avctx->width%4) {
  22 +        av_log(avctx, AV_LOG_ERROR, "width must be a multiple of 4 this colorspace and predictor\n");
  23 +        return AVERROR_INVALIDDATA;
  24 +    }
  25      alloc_temp(s);
  26
  27  //    av_log(NULL, AV_LOG_DEBUG, "pred:%d bpp:%d hbpp:%d il:%d\n", s->predictor, s->bitstream_bpp, avctx->bits_per_coded_sample, s->interlaced);
  28 --
  29 1.7.5.4
  30