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

[Matt Wolenetz]

ffmpeg | branch: release/3.2 | Matt Wolenetz <wolenetz at google.com> | Wed Dec 14 15:24:42 2016 -0800| [cf8e004a51b08c6e8ceaeebca85ab84c7ed0b4cf] | committer: Michael Niedermayer

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

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

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

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

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

 libavformat/mov.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 1e21418..17d0475 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -739,6 +739,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);