mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '3ca1dd2502a860989ee5289316af6b9816cee78f'
* commit '3ca1dd2502a860989ee5289316af6b9816cee78f':
xl: Make sure the width is valid
Conflicts:
libavcodec/xl.c
See: 94b42da696
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
6561aae8a9
|
@ -49,11 +49,10 @@ static int decode_frame(AVCodecContext *avctx,
|
||||||
uint32_t val;
|
uint32_t val;
|
||||||
int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0;
|
int y0, y1, y2, y3 = 0, c0 = 0, c1 = 0;
|
||||||
|
|
||||||
if (avctx->width & 3) {
|
if (avctx->width % 4) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "width is not a multiple of 4\n");
|
av_log(avctx, AV_LOG_ERROR, "width is not a multiple of 4\n");
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (buf_size < avctx->width * avctx->height) {
|
if (buf_size < avctx->width * avctx->height) {
|
||||||
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
|
av_log(avctx, AV_LOG_ERROR, "Packet is too small\n");
|
||||||
return AVERROR_INVALIDDATA;
|
return AVERROR_INVALIDDATA;
|
||||||
|
|
Loading…
Reference in New Issue