Merge pull request #9181 from rouault/force_to_unknown

OGRGeometryFactory::forceTo(): fix assertion with empty geometry and target type = unknown
OSGeo · Feb 1, 2024 · 23f6a7e · 23f6a7e
2 parents 85c93fd + 73d4ccb
commit 23f6a7e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 4 deletions.
diff --git a/autotest/cpp/test_ogr.cpp b/autotest/cpp/test_ogr.cpp
@@ -425,6 +425,11 @@ TEST_F(test_ogr, geometry_get_point)
     }
 }
 
+TEST_F(test_ogr, OGR_G_CreateGeometry_unknown)
+{
+    EXPECT_EQ(OGR_G_CreateGeometry(wkbUnknown), nullptr);
+}
+
 TEST_F(test_ogr, style_manager)
 {
     OGRStyleMgrH hSM = OGR_SM_Create(nullptr);

diff --git a/autotest/ogr/ogr_factory.py b/autotest/ogr/ogr_factory.py
@@ -902,6 +902,31 @@ def test_ogr_factory_8():
         ogrtest.check_feature_geometry(dst_geom, exp_wkt)
 
 
+###############################################################################
+# Test forceTo() to wkbUnknown
+
+
+@pytest.mark.parametrize(
+    "src_wkt,target_type,exp_wkt",
+    [
+        (
+            "POINT (1 2)",
+            ogr.wkbUnknown,
+            "POINT (1 2)",
+        ),
+        (
+            "POINT EMPTY",
+            ogr.wkbUnknown,
+            "POINT EMPTY",
+        ),
+    ],
+)
+def test_ogr_factory_forceTo_unknown(src_wkt, target_type, exp_wkt):
+    src_geom = ogr.CreateGeometryFromWkt(src_wkt)
+    dst_geom = ogr.ForceTo(src_geom, target_type)
+    ogrtest.check_feature_geometry(dst_geom, exp_wkt)
+
+
 ###############################################################################
 # Test forceTo()
 

diff --git a/ogr/ogrgeometryfactory.cpp b/ogr/ogrgeometryfactory.cpp
@@ -621,6 +621,9 @@ OGRGeometryFactory::createGeometry(OGRwkbGeometryType eGeometryType)
             poGeom = new (std::nothrow) OGRTriangulatedSurface();
             break;
 
+        case wkbUnknown:
+            break;
+
         default:
             CPLAssert(false);
             break;
@@ -4551,6 +4554,10 @@ OGRGeometry *OGRGeometryFactory::forceTo(OGRGeometry *poGeom,
     if (poGeom == nullptr)
         return poGeom;
 
+    const OGRwkbGeometryType eTargetTypeFlat = wkbFlatten(eTargetType);
+    if (eTargetTypeFlat == wkbUnknown)
+        return poGeom;
+
     if (poGeom->IsEmpty())
     {
         OGRGeometry *poRet = createGeometry(eTargetType);
@@ -4564,10 +4571,6 @@ OGRGeometry *OGRGeometryFactory::forceTo(OGRGeometry *poGeom,
         return poRet;
     }
 
-    const OGRwkbGeometryType eTargetTypeFlat = wkbFlatten(eTargetType);
-    if (eTargetTypeFlat == wkbUnknown)
-        return poGeom;
-
     OGRwkbGeometryType eType = poGeom->getGeometryType();
     OGRwkbGeometryType eTypeFlat = wkbFlatten(eType);