From 8c59e0c362b948a746392b65932dd1cfeab8076c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 21 Apr 2012 21:30:51 +0200 Subject: xldec: move buffer size check up, it can be done before allocating a frame Signed-off-by: Michael Niedermayer --- libavcodec/xl.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavcodec/xl.c') diff --git a/libavcodec/xl.c b/libavcodec/xl.c index c8b0e06a41..0c85e22fc0 100644 --- a/libavcodec/xl.c +++ b/libavcodec/xl.c @@ -57,6 +57,11 @@ static int decode_frame(AVCodecContext *avctx, return AVERROR_INVALIDDATA; } + if (buf_size < avctx->width * avctx->height) { + av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); + return AVERROR_INVALIDDATA; + } + if(p->data[0]) avctx->release_buffer(avctx, p); @@ -74,11 +79,6 @@ static int decode_frame(AVCodecContext *avctx, stride = avctx->width - 4; - if (buf_size < avctx->width * avctx->height) { - av_log(avctx, AV_LOG_ERROR, "Packet is too small\n"); - return AVERROR_INVALIDDATA; - } - for (i = 0; i < avctx->height; i++) { /* lines are stored in reversed order */ buf += stride; -- cgit v1.2.1