Merge pull request #10488 from rouault/fix_10486

PG: fix support for geometry/geography OID in range [2147483648, 4294967295]
OSGeo · Aug 10, 2024 · 7e1c209 · 7e1c209
2 parents c90bb9d + c04b25f
commit 7e1c209
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp b/ogr/ogrsf_frmts/pg/ogrpgdatasource.cpp
@@ -831,12 +831,12 @@ int OGRPGDataSource::Open(const char *pszNewName, int bUpdate, int bTestOpen,
             if (EQUAL(pszTypname, "geometry"))
             {
                 bHavePostGIS = TRUE;
-                nGeometryOID = atoi(pszOid);
+                nGeometryOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
             else if (CPLTestBool(CPLGetConfigOption("PG_USE_GEOGRAPHY", "YES")))
             {
                 bHaveGeography = TRUE;
-                nGeographyOID = atoi(pszOid);
+                nGeographyOID = static_cast<Oid>(strtoul(pszOid, nullptr, 10));
             }
         }
     }

diff --git a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp
@@ -564,7 +564,7 @@ OGRFeature *OGRPGLayer::RecordToFeature(PGresult *hResult,
     for (int iField = 0; iField < PQnfields(hResult); iField++)
     {
 #if defined(BINARY_CURSOR_ENABLED)
-        int nTypeOID = PQftype(hResult, iField);
+        const Oid nTypeOID = PQftype(hResult, iField);
 #endif
         const char *pszFieldName = PQfname(hResult, iField);