fix parse error reporting

strukturag · Oct 18, 2023 · feb3cee · feb3cee
1 parent 20ad9fb
commit feb3cee
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/libheif/file.cc b/libheif/file.cc
@@ -253,14 +253,19 @@ Error HeifFile::parse_heif_file(BitstreamRange& range)
     std::shared_ptr<Box> box;
     Error error = Box::read(range, &box);
 
+    if (range.error() || range.eof()) {
+      break;
+    }
+
     // When an EOF error is returned, this is not really a fatal exception,
     // but simply the indication that we reached the end of the file.
-    if (error != Error::Ok) {
-      return error;
+    // TODO: this design should be cleaned up
+    if (error.error_code == heif_error_Invalid_input && error.sub_error_code == heif_suberror_End_of_data) {
+      break;
     }
 
-    if (range.error() || range.eof()) {
-      break;
+    if (error != Error::Ok) {
+      return error;
     }
 
     m_top_level_boxes.push_back(box);