[FFmpeg-cvslog] lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid

[Matt Wolenetz]

ffmpeg | branch: master | Matt Wolenetz <wolenetz at google.com> | Wed Dec 14 15:26:19 2016 -0800| [2d453188c2303da641dafb048dc1806790526dfd] | committer: Michael Niedermayer

lavf/mov.c: Avoid heap allocation wrap in mov_read_uuid

Core of patch is from paul at paulmehta.com
Reference https://crbug.com/643951

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
Check value reduced as the code does not support values beyond INT_MAX
Also the check is moved to a more common place and before integer truncation

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

 libavformat/mov.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 8c54539..ca49786 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4789,7 +4789,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         0x88, 0x14, 0x58, 0x7a, 0x02, 0x52, 0x1f, 0xdd,
     };
 
-    if (atom.size < sizeof(uuid) || atom.size == INT64_MAX)
+    if (atom.size < sizeof(uuid) || atom.size >= FFMIN(INT_MAX, SIZE_MAX))
         return AVERROR_INVALIDDATA;
 
     if (c->fc->nb_streams < 1)