diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-30 01:19:17 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-28 18:53:11 +0100 |
| commit | ffd5ccee5df504ea8a9f0a8da71e2ce5433da728 (patch) | |
| tree | dd66fb5d9e72e4d054fe654fabfa53b2a7b0a66b | |
| parent | a4b6d5574f056ca535894b486a14ea22c11a5df1 (diff) | |
| download | ffmpeg-ffd5ccee5df504ea8a9f0a8da71e2ce5433da728.tar.gz | |
avcodec/g2meet: check tile dimensions to avoid integer overflow
Fixes out of array access
Fixes: asan_heap-oob_12a55d3_30_029.wmv
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 32e666c354e4a3160d8cf1d303cb51990b095c87)
Conflicts:
libavcodec/g2meet.c
| -rw-r--r-- | libavcodec/g2meet.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index b83be23bc0..a9c44cfcad 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -714,7 +714,10 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data, } c->tile_width = bytestream2_get_be32(&bc); c->tile_height = bytestream2_get_be32(&bc); - if (!c->tile_width || !c->tile_height) { + if (c->tile_width <= 0 || c->tile_height <= 0 || + ((c->tile_width | c->tile_height) & 0xF) || + c->tile_width * 4LL * c->tile_height >= INT_MAX + ) { av_log(avctx, AV_LOG_ERROR, "Invalid tile dimensions %dx%d\n", c->tile_width, c->tile_height); |