diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 21:30:51 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 21:31:25 +0200 |
commit | 8c59e0c362b948a746392b65932dd1cfeab8076c (patch) | |
tree | d95ebdb956f9db2ced5908cfb698ef0c32ab5d27 /libavcodec/xl.c | |
parent | 94b42da6963a88c9518039e0b8ca42b6aab8bfb3 (diff) | |
download | ffmpeg-8c59e0c362b948a746392b65932dd1cfeab8076c.tar.gz |
xldec: move buffer size check up, it can be done before allocating a frame
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/xl.c')
-rw-r--r-- | libavcodec/xl.c | 10 |
1 files changed, 5 insertions, 5 deletions
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; |