summaryrefslogtreecommitdiff
path: root/libavformat/cdxl.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-31 21:41:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-31 22:33:51 +0100
commit3eb5cbe0c50d0a0bbe10bcabbd6b16d73d93c128 (patch)
treebe6ab3f134dfa0b34448004469c2bb15b5610175 /libavformat/cdxl.c
parent975ff6a3c638c3992afb56a24e1747e28cef7d8f (diff)
avformat/cdxl: Fix integer overflow of image_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/cdxl.c')
-rw-r--r--libavformat/cdxl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c
index 5bdf44bcd1..f198bf50fa 100644
--- a/libavformat/cdxl.c
+++ b/libavformat/cdxl.c
@@ -130,6 +130,8 @@ static int cdxl_read_packet(AVFormatContext *s, AVPacket *pkt)
height = AV_RB16(&cdxl->header[16]);
palette_size = AV_RB16(&cdxl->header[20]);
audio_size = AV_RB16(&cdxl->header[22]);
+ if (FFALIGN(width, 16) * (uint64_t)height * cdxl->header[19] > INT_MAX)
+ return AVERROR_INVALIDDATA;
image_size = FFALIGN(width, 16) * height * cdxl->header[19] / 8;
video_size = palette_size + image_size;