Bug 1101247 - Handle empty top-level mp4 boxes in MoofParser. r=ajones

dothq · Nov 20, 2014 · a6aadad · a6aadad
1 parent a6d2382
commit a6aadad
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/media/libstagefright/binding/Box.cpp b/media/libstagefright/binding/Box.cpp
@@ -59,15 +59,19 @@ Box::Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent)
   }
 
   MediaByteRange boxRange(aOffset, aOffset + size);
-  if (mChildOffset >= boxRange.mEnd ||
+  if (mChildOffset > boxRange.mEnd ||
       (mParent && !mParent->mRange.Contains(boxRange)) ||
       !byteRange->Contains(boxRange)) {
     return;
   }
-  mRange = MediaByteRange(aOffset, aOffset + size);
+  mRange = boxRange;
   mType = BigEndian::readUint32(&header[4]);
 }
 
+Box::Box()
+  : mContext(nullptr), mType(0)
+{}
+
 Box
 Box::Next() const
 {
@@ -79,6 +83,9 @@ Box
 Box::FirstChild() const
 {
   MOZ_ASSERT(IsAvailable());
+  if (mChildOffset == mRange.mEnd) {
+    return Box();
+  }
   return Box(mContext, mChildOffset, this);
 }
 

diff --git a/media/libstagefright/binding/include/mp4_demuxer/Box.h b/media/libstagefright/binding/include/mp4_demuxer/Box.h
@@ -35,6 +35,7 @@ class Box
 {
 public:
   Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent = nullptr);
+  Box();
 
   bool IsAvailable() const { return !mRange.IsNull(); }
   uint64_t Offset() const { return mRange.mStart; }
-Original file line number
+Diff line change
@@ Expand Up / @@ -35,6 +35,7 @@ class Box @@
     {
     public:
       Box(BoxContext* aContext, uint64_t aOffset, const Box* aParent = nullptr);
+      Box();
       bool IsAvailable() const { return !mRange.IsNull(); }
       uint64_t Offset() const { return mRange.mStart; }
@@ Expand Down @@