aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-31 21:41:46 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-01-09 17:18:40 +0100
commit6ac156864ca5055b9971ef0a8e7a35d2eecbb46f (patch)
tree28da15e5c564e03e92e6d954d377b74c1b3f629a
parent0775653b4c4736e593040a81123c8c284714e0ae (diff)
downloadffmpeg-6ac156864ca5055b9971ef0a8e7a35d2eecbb46f.tar.gz
avformat/cdxl: Fix integer overflow of image_size
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit 3eb5cbe0c50d0a0bbe10bcabbd6b16d73d93c128) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/cdxl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c
index e3e379aef7..6d8e750b83 100644
--- a/libavformat/cdxl.c
+++ b/libavformat/cdxl.c
@@ -127,6 +127,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;