Merge pull request #2269 from kevinbackhouse/jp2image-assert

Replace assert with enforce

Author: kevinbackhouse

src/jp2image.cpp

@@ -507,7 +507,7 @@ namespace Exiv2
                             }
 
                             if (subBox.type == kJp2BoxTypeImageHeader) {
-                                assert(subBox.length == 22);
+                                enforce(subBox.length == 22, kerCorruptedMetadata);
                                 // height (4), width (4), componentsCount (2), bpc (1)
                                 uint8_t compressionType = data.pData_[11];
                                 uint8_t unkC = data.pData_[12];

test/data/issue_2268_poc.jp2

@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, check_no_ASAN_UBSAN_errors
+
+class issue_2268_jp2_assert(metaclass=CaseMeta):
+    url      = "https://github.com/Exiv2/exiv2/issues/2268"
+    filename = "$data_path/issue_2268_poc.jp2"
+    commands = ["$exiv2 -pS $filename"]
+    retval   = [1]
+    stderr   = ["""$exiv2_exception_message $filename:
+$kerCorruptedMetadata
+"""]
+    compare_stdout = check_no_ASAN_UBSAN_errors