avformat/mov: fix integer overflow in mov_read_udta_string()

Found-by: Paul Mehta <paul@paulmehta.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Gbp-Pq: Name CVE-2015-1207.patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index c37a66f061b335f4835bb4c8538e70f29673af77..b51e41b690cf8a09b2ea7717bc52bfeb4b4b3c36 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -337,7 +337,7 @@ static int mov_read_udta_string(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     if (!key)
         return 0;
-    if (atom.size < 0)
+    if (atom.size < 0 || str_size >= INT_MAX/2)
         return AVERROR_INVALIDDATA;
 
     str_size = FFMIN3(sizeof(str)-1, str_size, atom.size);