diff --git a/src/atom_ftyp.cpp b/src/atom_ftyp.cpp
index 52d7cc5..4e173aa 100644
--- a/src/atom_ftyp.cpp
+++ b/src/atom_ftyp.cpp
@@ -53,8 +53,13 @@ void MP4FtypAtom::Generate()
 
 void MP4FtypAtom::Read()
 {
+<<<<<<< Updated upstream
    if ( m_size == 0ULL )
       return;
+=======
+   if ( m_size < 8ULL )
+      throw new Exception( "Invalid ftyp atom size", __FILE__, __LINE__, __FUNCTION__ );
+>>>>>>> Stashed changes
 
     compatibleBrands.SetCount( (m_size - 8) / 4 ); // brands array fills rest of atom
     MP4Atom::Read();