RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

xl: Make sure the width is valid 

And undo the wrong commit f1cb490d6d

CC: libav-stable@libav.org
This commit is contained in:
Luca Barbato 2013-07-28 18:24:15 +02:00
parent 0f51c398be
commit 3ca1dd2502
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/xl.c
View File

@ -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;
}