From a22e64fd02133867406604cb6589bb31696f08bc Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Fri, 23 Mar 2012 10:48:18 +0100 Subject: [PATCH] rawdec: Check w/h. Fixes FPE Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind Signed-off-by: Michael Niedermayer --- libavcodec/rawdec.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index 8b8e9d6a1f..b59224302a 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -158,6 +158,11 @@ static int raw_decode(AVCodecContext *avctx, if(buf_size < context->length - (avctx->pix_fmt==PIX_FMT_PAL8 ? 256*4 : 0)) return -1; + if (avctx->width <= 0 || avctx->height <= 0) { + av_log(avctx, AV_LOG_ERROR, "w/h is invalid\n"); + return AVERROR(EINVAL); + } + //2bpp and 4bpp raw in avi and mov (yes this is ugly ...) if (context->buffer) { int i;