aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-18 19:28:51 +0100
committerAndreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>2015-12-19 14:28:51 +0100
commit9d38f06d05efbb9d6196c27668eb943e934943ae (patch)
tree27bd87bba1d0c11d456ac6acaf75fb2f56c92929
parentc413d9e6356e843aa492be9bb0ddf66ae6c97501 (diff)
downloadffmpeg-9d38f06d05efbb9d6196c27668eb943e934943ae.tar.gz
xwddec: prevent overflow of lsize * avctx->height
This is used to check if the input buffer is large enough, so if this overflows it can cause a false negative leading to a segmentation fault in bytestream2_get_bufferu. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
-rw-r--r--libavcodec/xwddec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/xwddec.c b/libavcodec/xwddec.c
index 2febedc4aa..64cd8418a2 100644
--- a/libavcodec/xwddec.c
+++ b/libavcodec/xwddec.c
@@ -141,7 +141,7 @@ static int xwd_decode_frame(AVCodecContext *avctx, void *data,
return AVERROR_INVALIDDATA;
}
- if (bytestream2_get_bytes_left(&gb) < ncolors * XWD_CMAP_SIZE + avctx->height * lsize) {
+ if (bytestream2_get_bytes_left(&gb) < ncolors * XWD_CMAP_SIZE + (uint64_t)avctx->height * lsize) {
av_log(avctx, AV_LOG_ERROR, "input buffer too small\n");
return AVERROR_INVALIDDATA;
}