fix for #233

axiomatic-systems · Jan 7, 2018 · e13b22f · e13b22f
1 parent 70df1a5
commit e13b22f
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/Source/C++/Core/Ap4FtypAtom.cpp b/Source/C++/Core/Ap4FtypAtom.cpp
@@ -42,14 +42,18 @@ AP4_DEFINE_DYNAMIC_CAST_ANCHOR(AP4_FtypAtom)
 |   AP4_FtypAtom::AP4_FtypAtom
 +---------------------------------------------------------------------*/
 AP4_FtypAtom::AP4_FtypAtom(AP4_UI32 size, AP4_ByteStream& stream) :
-    AP4_Atom(AP4_ATOM_TYPE_FTYP, size)
+    AP4_Atom(AP4_ATOM_TYPE_FTYP, size),
+    m_MajorBrand(0),
+    m_MinorVersion(0)
 {
+    if (size < 16) return;
     stream.ReadUI32(m_MajorBrand);
     stream.ReadUI32(m_MinorVersion);
     size -= 16;
-    while (size) {
+    while (size >= 4) {
         AP4_UI32 compatible_brand;
-        stream.ReadUI32(compatible_brand);
+        AP4_Result result = stream.ReadUI32(compatible_brand);
+        if (AP4_FAILED(result)) return;
         m_CompatibleBrands.Append(compatible_brand);
         size -= 4;
     }