Merge pull request #4 from pushd/overflow

Integrate upstream fix to iOS 11 parsing error
pushd · Sep 30, 2017 · 1062c75 · 1062c75
2 parents 5966a6f + e46c37b
commit 1062c75
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/Srcs/common/bitstream.cpp b/Srcs/common/bitstream.cpp
@@ -339,8 +339,8 @@ void BitStream::readZeroTerminatedString(string& dstString)
     char currChar;
 
     dstString.clear();
-    currChar = read8Bits();
-    while (currChar != '\0')
+
+    while (mByteOffset != getSize() && (currChar = read8Bits()) != '\0')
     {
         dstString += currChar;
         currChar = read8Bits();

diff --git a/Srcs/common/iteminfobox.cpp b/Srcs/common/iteminfobox.cpp
@@ -342,11 +342,7 @@ void ItemInfoEntry::parseBox(BitStream& bitstr)
         if (mItemType == "mime")
         {
             bitstr.readZeroTerminatedString(mContentType);
-            try {
-                bitstr.readZeroTerminatedString(mContentEncoding);
-            } catch (std::out_of_range& e) {
-                // Some iPhone images break here, but it's not critical to the conversion
-            }
+            bitstr.readZeroTerminatedString(mContentEncoding);
         }
         else if (mItemType == "uri ")
         {