IntersectionMatrix: Ignore patterns longer than 9 characters

Fixes #1084
libgeos · Apr 30, 2024 · 02ea4ff · 02ea4ff
1 parent fcaebfc
commit 02ea4ff
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/src/geom/IntersectionMatrix.cpp b/src/geom/IntersectionMatrix.cpp
@@ -144,7 +144,7 @@ IntersectionMatrix::set(Location row, Location col, int dimensionValue)
 void
 IntersectionMatrix::set(const std::string& dimensionSymbols)
 {
-    auto limit = dimensionSymbols.length();
+    auto limit = std::min(dimensionSymbols.length(), 9ul);
 
     for(std::size_t i = 0; i < limit; i++) {
         auto row = i / firstDim;

diff --git a/tests/unit/capi/GEOSRelatePatternMatchTest.cpp b/tests/unit/capi/GEOSRelatePatternMatchTest.cpp
@@ -78,5 +78,18 @@ void object::test<5>
     ensure_equals(ret, char(0));
 }
 
+// invalid DE-9IM argument
+// https://github.com/libgeos/geos/issues/1084
+template<>
+template<>
+void object::test<6>
+()
+{
+    const char* mat = "0000000000";
+    ensure_equals(strlen(mat), 10u); // not a valid DE-9IM!
+
+    GEOSRelatePatternMatch(mat,  "111111111");
+}
+
 } // namespace tut