lavf/mov.c: Avoid heap allocation wrap in mov_read_hdlr
authorMatt Wolenetz <wolenetz@google.com>
Wed, 14 Dec 2016 23:24:42 +0000 (15:24 -0800)
committerMichael Niedermayer <michael@niedermayer.cc>
Wed, 8 Feb 2017 03:08:26 +0000 (04:08 +0100)
Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643950

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Check value reduced as the code does not support larger lengths

(cherry picked from commit fd30e4d57fe5841385f845440688505b88c0f4a9)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mov.c

index 6b90d08..e6b6c67 100644 (file)
@@ -674,6 +674,8 @@ static int mov_read_hdlr(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     title_size = atom.size - 24;
     if (title_size > 0) {
+        if (title_size > FFMIN(INT_MAX, SIZE_MAX-1))
+            return AVERROR_INVALIDDATA;
         title_str = av_malloc(title_size + 1); /* Add null terminator */
         if (!title_str)
             return AVERROR(ENOMEM);