diff options
| author | Luca Barbato <lu_zero@gentoo.org> | 2013-07-28 18:24:15 +0200 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2013-07-28 19:36:44 +0200 |
| commit | 3ca1dd2502a860989ee5289316af6b9816cee78f (patch) | |
| tree | 6d928fd876d034f07482892c55b2d9f68454fd4d /libavcodec/xl.c | |
| parent | 0f51c398beac87682b2249662b97e30512f7868c (diff) | |
| download | ffmpeg-3ca1dd2502a860989ee5289316af6b9816cee78f.tar.gz | |
xl: Make sure the width is valid
And undo the wrong commit f1cb490d6d7391ff7e28cc376908cc98a652228d
CC: libav-stable@libav.org
Diffstat (limited to 'libavcodec/xl.c')
| -rw-r--r-- | libavcodec/xl.c | 7 |
1 files changed, 6 insertions, 1 deletions
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; } |