[FFmpeg-cvslog] go2meeting: disallow tile dimensions that are not multiple of 16

[Kostya Shishkov]

ffmpeg | branch: master | Kostya Shishkov <kostya.shishkov at gmail.com> | Fri Nov 29 09:15:00 2013 +0100| [01f6df01b6fdc2d71b82370374cde4bf102928c7] | committer: Anton Khirnov

go2meeting: disallow tile dimensions that are not multiple of 16

Original decoder seems to always use 176x128 tiles anyway and this helps
avoiding lots of issues with odd tile sizes in fuzzed files.

Signed-off-by: Anton Khirnov <anton at khirnov.net>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=01f6df01b6fdc2d71b82370374cde4bf102928c7
---

 libavcodec/g2meet.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 0b4a8b7..ad27c57 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -712,7 +712,8 @@ 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 || !c->tile_height ||
+                ((c->tile_width | c->tile_height) & 0xF)) {
                 av_log(avctx, AV_LOG_ERROR,
                        "Invalid tile dimensions %dx%d\n",
                        c->tile_width, c->tile_height);