CVE-2016-3062

Gbp-Pq: Name CVE-2016-3062.patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index a1de6526a04e7c13fa130d55cd0be929143039fd..4e636e7b157a9f24ec74bf6ad1148c58298d0d81 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -387,8 +387,10 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     avio_rb32(pb); // version + flags
     entries = avio_rb32(pb);
-    if (entries >= UINT_MAX / sizeof(*sc->drefs))
+    if (!entries ||
+        entries >= UINT_MAX / sizeof(*sc->drefs))
         return AVERROR_INVALIDDATA;
+    sc->drefs_count = 0;
     sc->drefs = av_mallocz(entries * sizeof(*sc->drefs));
     if (!sc->drefs)
         return AVERROR(ENOMEM);