IndexedFacetDistance: Avoid crash with Inf coordinates

Fixes #821
libgeos · Feb 27, 2023 · d1adb8f · d1adb8f
1 parent 625297b
commit d1adb8f
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 1 deletion.
diff --git a/src/operation/distance/FacetSequence.cpp b/src/operation/distance/FacetSequence.cpp
@@ -128,7 +128,7 @@ FacetSequence::computeDistancePointLine(const Coordinate& pt,
         const Coordinate& q0 = facetSeq.pts->getAt(i);
         const Coordinate& q1 = facetSeq.pts->getAt(i + 1);
         double dist = Distance::pointToSegment(pt, q0, q1);
-        if(dist < minDistance) {
+        if(dist < minDistance || (locs != nullptr && locs->empty())) {
             minDistance = dist;
             if (locs != nullptr) {
                 updateNearestLocationsPointLine(pt, facetSeq, i, q0, q1, locs);

diff --git a/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp b/tests/unit/algorithm/construct/MaximumInscribedCircleTest.cpp
@@ -13,6 +13,7 @@
 #include <geos/geom/PrecisionModel.h>
 #include <geos/io/WKTReader.h>
 #include <geos/io/WKTWriter.h>
+#include <geos/io/WKBReader.h>
 // std
 #include <sstream>
 #include <string>
@@ -37,6 +38,7 @@ struct test_mic_data {
     geos::geom::GeometryFactory::Ptr factory_;
     geos::io::WKTReader reader_;
     geos::io::WKTWriter writer_;
+    geos::io::WKBReader wkbreader_;
 
     test_mic_data():
         geom_(nullptr),

diff --git a/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp b/tests/unit/capi/GEOSMaximumInscribedCircleTest.cpp
@@ -78,5 +78,22 @@ void object::test<2>
 }
 
 
+// Crash with Inf coords
+// https://github.com/libgeos/geos/issues/821
+template<>
+template<>
+void object::test<3>
+()
+{
+    std::string wkb("0106000020E61000000100000001030000000100000005000000000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F000000000000F07F");
+    geom1_ = GEOSGeomFromHEX_buf(reinterpret_cast<const unsigned char*>(wkb.c_str()), wkb.size());
+
+    result_ = GEOSMaximumInscribedCircle(geom1_, 1);
+
+    // no crash
+}
+
+
+
 } // namespace tut
 
diff --git a/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp b/tests/unit/operation/distance/IndexedFacetDistanceTest.cpp
@@ -32,6 +32,8 @@
 #define M_PI 3.14159265358979323846
 #endif
 
+using geos::operation::distance::IndexedFacetDistance;
+
 namespace tut {
 //
 // Test Group
@@ -382,6 +384,20 @@ void object::test<11>
     catch (const GEOSException&) { }
 }
 
+// Test with Inf coords
+template<>
+template<>
+void object::test<12>()
+{
+    auto g1 = _wktreader.read("POINT (0 0)");
+    auto g2 = _wktreader.read("LINESTRING (3 Inf, 5 Inf)");
+
+    IndexedFacetDistance ifd1(g1.get());
+
+    auto pts = ifd1.nearestPoints(g2.get());
+    ensure_equals(pts->size(), 2u);
+}
+
 
 
 // TODO: finish the tests by adding: