OGRGeometryFactory::forceTo(): fix assertion with empty geometry and …

…target type = unknown Found by CIFuzz: https://github.com/OSGeo/gdal/actions/runs/7740101693/job/21105197876?pr=9166
OSGeo · Feb 1, 2024 · d55c91b · d55c91b
1 parent d1868de
commit d55c91b
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 4 deletions.
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
+
+
+def test_ogr_factory_forceTo_unknown():
+
+    tests = [
+        (
+            "POINT (1 2)",
+            ogr.wkbUnknown,
+            "POINT (1 2)",
+        ),
+        (
+            "POINT EMPTY",
+            ogr.wkbUnknown,
+            "POINT EMPTY",
+        ),
+    ]
+    for (src_wkt, target_type, exp_wkt) in tests:
+        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
@@ -4551,6 +4551,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 +4568,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);