mov: Check the entries value when parsing dref boxes

Message ID 20160311135004.A14D65DAD2@aruru.libav.org
State New
Headers show

Commit Message

Janne Grunau March 11, 2016, 1:50 p.m.
Module: libav
Branch: master
Commit: 7e01d48cfd168c3dfc663f03a3b6a98e0ecba328

Author:    Luca Barbato <lu_zero@gentoo.org>
Committer: Luca Barbato <lu_zero@gentoo.org>
Date:      Tue Mar  8 11:57:16 2016 +0100

mov: Check the entries value when parsing dref boxes

And properly reset the entries count when resetting the entries.

CC: libav-stable@libav.org

Bug-Id: 929
Bug-Id: CVE-2016-3062

---

 libavformat/mov.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Patch

diff --git a/libavformat/mov.c b/libavformat/mov.c
index a556aa7..9d271f8 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -473,9 +473,11 @@  static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     avio_rb32(pb); // version + flags
     entries = avio_rb32(pb);
-    if (entries >  (atom.size - 1) / MIN_DATA_ENTRY_BOX_SIZE + 1 ||
+    if (!entries ||
+        entries >  (atom.size - 1) / MIN_DATA_ENTRY_BOX_SIZE + 1 ||
         entries >= UINT_MAX / sizeof(*sc->drefs))
         return AVERROR_INVALIDDATA;
+    sc->drefs_count = 0;
     av_free(sc->drefs);
     sc->drefs = av_mallocz(entries * sizeof(*sc->drefs));
     if (!sc->drefs)