diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-09-04 12:10:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-11-12 02:55:46 +0100 |
| commit | 746a65640f7149b56afd586412a8ae74980fd553 (patch) | |
| tree | c70dd83824b98aff3dbbb1b922eebd8d16cd0e6e | |
| parent | 50e4d38ce4739dbde9551c56ae18541349e67532 (diff) | |
| download | ffmpeg-746a65640f7149b56afd586412a8ae74980fd553.tar.gz | |
avcodec/g2meet: Fix potential overflow in tile dimensions check
Fixes CID1322351
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 71ec8e1ed6cf4947e204e3e4b5929a44c054f5fb)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavcodec/g2meet.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 6482483444..cd0d80d894 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -746,7 +746,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", |