Merge pull request #1621 from Exiv2/mergify/bp/main/pr-1591

Fix infinite loop caused by subBox with zero size. (backport #1591)
Exiv2 · May 11, 2021 · 170b18d · 170b18d
2 parents b4b8061 + aac3463
commit 170b18d
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/src/jp2image.cpp b/src/jp2image.cpp
@@ -670,6 +670,7 @@ static void boxes_check(size_t b,size_t m)
 #ifdef EXIV2_DEBUG_MESSAGES
                 std::cout << "Jp2Image::encodeJp2Header subbox: "<< toAscii(subBox.type) << " length = " << subBox.length << std::endl;
 #endif
+                enforce(subBox.length > 0, Exiv2::kerCorruptedMetadata);
                 enforce(subBox.length <= length - count, Exiv2::kerCorruptedMetadata);
                 count        += subBox.length;
                 newBox.type   = subBox.type;