Merge pull request #2614 from Exiv2/kmilos_fix_bmff_zero_box_027

BMFF: fix handling of boxes w/ zero length or type (backport #2612)

src/bmffimage.cpp

@@ -134,7 +134,7 @@ namespace Exiv2
         // Allows boxHandler() to optimise the reading of files by identifying
         // box types that we're not interested in. Box types listed here must
         // not appear in the cases in switch (box_type) in boxHandler().
-        return box == TAG_mdat; // mdat is where the main image lives and can be huge
+        return box == 0 || box == TAG_mdat; // mdat is where the main image lives and can be huge
     }
 
     std::string BmffImage::mimeType() const
@@ -238,6 +238,11 @@ namespace Exiv2
             box_length = getULongLong(data.pData_, endian_);
         }
 
+        if (box_length == 0) {
+            // Zero length is also valid and indicates box extends to the end of file.
+            box_length = pbox_end - address;
+        }
+
         // read data in box and restore file position
         long restore = io_->tell();
         enforce(box_length >= hdrsize, Exiv2::kerCorruptedMetadata);