From 3ca1dd2502a860989ee5289316af6b9816cee78f Mon Sep 17 00:00:00 2001 From: Luca Barbato Date: Sun, 28 Jul 2013 18:24:15 +0200 Subject: xl: Make sure the width is valid And undo the wrong commit f1cb490d6d7391ff7e28cc376908cc98a652228d CC: libav-stable@libav.org --- libavcodec/xl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libavcodec/xl.c') diff --git a/libavcodec/xl.c b/libavcodec/xl.c index 03df7c3eab..65153b4511 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -49,7 +49,12 @@ static int decode_frame(AVCodecContext *avctx, uint32_t val; int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0; - if (buf_size < avctx->width * avctx->height * sizeof(int32_t)) { + if (avctx->width % 4) { + av_log(avctx, AV_LOG_ERROR, "Width not a multiple of 4.\n"); + return AVERROR_INVALIDDATA; + } + + if (buf_size < avctx->width * avctx->height) { av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); return AVERROR_INVALIDDATA; } -- cgit v1.2.3