aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-09-04 12:10:02 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2015-09-04 12:14:13 +0200
commit71ec8e1ed6cf4947e204e3e4b5929a44c054f5fb (patch)
tree1b7d75c894d3ec71097ef3a4e26003b22735e734
parentc447ab0e746c6b4d8d703a55190ae7444199e502 (diff)
downloadffmpeg-71ec8e1ed6cf4947e204e3e4b5929a44c054f5fb.tar.gz
avcodec/g2meet: Fix potential overflow in tile dimensions check
Fixes CID1322351 Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavcodec/g2meet.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index b1457b7f97..487b75f154 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -1448,7 +1448,7 @@ static int g2m_decode_frame(AVCodecContext *avctx, void *data,
c->tile_height = bytestream2_get_be32(&bc);
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
+ c->tile_width * (uint64_t)c->tile_height >= INT_MAX / 4
) {
av_log(avctx, AV_LOG_ERROR,
"Invalid tile dimensions %dx%d\n",