Merge pull request #9372 from rouault/sealing_fixes

RFC 97 / Sealing fixes (master only)
OSGeo · Mar 3, 2024 · 5a5c0d2 · 5a5c0d2
2 parents c414fdf + 2025c72
commit 5a5c0d2
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/autotest/ogr/ogr_rfc41.py b/autotest/ogr/ogr_rfc41.py
@@ -400,7 +400,6 @@ def test_ogr_rfc41_6():
     geomfield = ogr.GeomFieldDefn("geomfield", ogr.wkbPolygon)
     geomfield.SetSpatialRef(sr)
     lyr.CreateGeomField(geomfield)
-    lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName("geomfield")
     lyr.CreateField(ogr.FieldDefn("intfield", ogr.OFTInteger))
     lyr.CreateField(ogr.FieldDefn("wkt", ogr.OFTString))
     feat = ogr.Feature(lyr.GetLayerDefn())

diff --git a/autotest/ogr/ogr_sql_test.py b/autotest/ogr/ogr_sql_test.py
@@ -696,9 +696,15 @@ def test_ogr_sql_28():
 
     ds = ogr.GetDriverByName("Memory").CreateDataSource("my_ds")
     lyr = ds.CreateLayer("my_layer")
-    lyr.GetLayerDefn().GetGeomFieldDefn(0).SetName(
-        "geom"
-    )  # a bit border line but OK for Memory driver...
+
+    new_geom_field_defn = ogr.GeomFieldDefn("geom", ogr.wkbUnknown)
+    assert (
+        lyr.AlterGeomFieldDefn(
+            0, new_geom_field_defn, ogr.ALTER_GEOM_FIELD_DEFN_NAME_FLAG
+        )
+        == ogr.OGRERR_NONE
+    )
+
     field_defn = ogr.FieldDefn("strfield", ogr.OFTString)
     lyr.CreateField(field_defn)
     field_defn = ogr.FieldDefn("intfield", ogr.OFTInteger)

diff --git a/ogr/ogrgeomfielddefn.cpp b/ogr/ogrgeomfielddefn.cpp
@@ -181,9 +181,8 @@ void OGRGeomFieldDefn::SetName(const char *pszNameIn)
 {
     if (m_bSealed)
     {
-        CPLError(
-            CE_Failure, CPLE_AppDefined,
-            "OGRGeomFieldDefn::SetComment() not allowed on a sealed object");
+        CPLError(CE_Failure, CPLE_AppDefined,
+                 "OGRGeomFieldDefn::SetName() not allowed on a sealed object");
         return;
     }
     if (pszName != pszNameIn)

diff --git a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -3458,7 +3458,7 @@ OGRErr OGRShapeLayer::ResizeDBF()
             }
             else
             {
-                poFieldDefn->SetWidth(panBestWidth[j]);
+                whileUnsealing(poFieldDefn)->SetWidth(panBestWidth[j]);
             }
         }
     }
-Original file line number
+Diff line change
@@ Expand Up / @@ -3458,7 +3458,7 @@ OGRErr OGRShapeLayer::ResizeDBF() @@
                 }
                 else
                 {
-                    poFieldDefn->SetWidth(panBestWidth[j]);
+                    whileUnsealing(poFieldDefn)->SetWidth(panBestWidth[j]);
                 }
             }
         }
@@ Expand Down @@