aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-30 01:19:17 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-10-30 01:22:32 +0100
commit32e666c354e4a3160d8cf1d303cb51990b095c87 (patch)
treed7679dd357ddce52c9aaa64df162c877a8ed8381
parentf05855414ed4cce97c06ba2a31f4987af47e6d4e (diff)
downloadffmpeg-32e666c354e4a3160d8cf1d303cb51990b095c87.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>
-rw-r--r--libavcodec/g2meet.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 41ad943150..0cd502bc08 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -736,8 +736,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 ||
- ((c->tile_width | c->tile_height) & 0xF)) {
+ 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);