diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-31 21:41:46 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 17:06:08 +0100 |
| commit | 93c9f1b97cdd898699a47751a39ae6fbae87d49e (patch) | |
| tree | f083bc1eb3b2b024eaca72bd26f532fdad6c41c6 /libavformat | |
| parent | e76a5a9c284c033210485b952ec4cadc05034503 (diff) | |
| download | ffmpeg-93c9f1b97cdd898699a47751a39ae6fbae87d49e.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>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/cdxl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/cdxl.c b/libavformat/cdxl.c index 185b745bb0..226a704650 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; |