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

[Matt Wolenetz]

ffmpeg | branch: release/3.2 | Matt Wolenetz <wolenetz at google.com> | Wed Dec 14 15:26:19 2016 -0800| [ed2572b9c8f885e2a4764d2e34604442a71899a1] | 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

(cherry picked from commit 2d453188c2303da641dafb048dc1806790526dfd)
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

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

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

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 17d0475..74b5825 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4436,7 +4436,7 @@ static int mov_read_uuid(MOVContext *c, AVIOContext *pb, MOVAtom atom)
         0x9c, 0x71, 0x99, 0x94, 0x91, 0xe3, 0xaf, 0xac
     };
 
-    if (atom.size < sizeof(uuid) || atom.size == INT64_MAX)
+    if (atom.size < sizeof(uuid) || atom.size >= FFMIN(INT_MAX, SIZE_MAX))
         return AVERROR_INVALIDDATA;
 
     ret = avio_read(pb, uuid, sizeof(uuid));