commit c63e58756699d07b5bc69799db388600d3e634bf
author Matt Wolenetz <wolenetz@google.com> Wed Dec 14 15:27:49 2016 -0800
committer Michael Niedermayer <michael@niedermayer.cc> Fri Feb 10 12:16:24 2017 +0100
tree 3175e4471f15ab0500b5fe58be69701ed173514d
parent b5c13002d18e8cd0ab19b37bb1fff3ea75ec3e5e

lavf/mov.c: Avoid heap allocation wraps in mov_read_{senc,saiz}()

Core of patch is from paul@paulmehta.com
Reference https://crbug.com/643952 (senc,saiz portions)

Signed-off-by: Matt Wolenetz <wolenetz@chromium.org>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 36aba43bd5fae8595dd9a566fbcfbbea63f0fca3)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>

libavformat/mov.c

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 6fc792f..b06e9c8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -4064,8 +4064,8 @@
 
     avio_rb32(pb);        /* entries */
 
-    if (atom.size < 8) {
-        av_log(c->fc, AV_LOG_ERROR, "senc atom size %"PRId64" too small\n", atom.size);
+    if (atom.size < 8 || atom.size > FFMIN(INT_MAX, SIZE_MAX)) {
+        av_log(c->fc, AV_LOG_ERROR, "senc atom size %"PRId64" invalid\n", atom.size);
         return AVERROR_INVALIDDATA;
     }