Shape: fix potential nullptr deref on corrupted CRS in GetSpatialRef() (fix regression introduced by a31c4d0, https://issues.oss-fuzz.com/issues/458229990)

rouault · rouault · commit ea75dfb98cb6 · 2025-11-06T13:30:31.000+01:00
diff --git a/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp b/ogr/ogrsf_frmts/shape/ogrshapelayer.cpp
@@ -2502,11 +2502,12 @@ const OGRSpatialReference *OGRShapeGeomFieldDefn::GetSpatialRef() const
         if (poSRSNonConst)
         {
             double adfTOWGS84[7];
+            const char *pszSRSName = poSRSNonConst->GetName();
             if (CPLTestBool(
                     CPLGetConfigOption("USE_OSR_FIND_MATCHES", "YES")) &&
                 // Below works around bug fixed in PROJ per
                 // https://github.com/OSGeo/PROJ/pull/4599
-                !(strstr(poSRSNonConst->GetName(), "NTF (Paris)") != nullptr &&
+                !(pszSRSName && strstr(pszSRSName, "NTF (Paris)") != nullptr &&
                   poSRSNonConst->GetTOWGS84(adfTOWGS84) == OGRERR_NONE))
             {
                 auto poSRSMatch = poSRSNonConst->FindBestMatch();

Original file line number	Diff line number	Diff line change
`@@ -2502,11 +2502,12 @@ const OGRSpatialReference *OGRShapeGeomFieldDefn::GetSpatialRef() const`
`2502`	`2502`	`if (poSRSNonConst)`
`2503`	`2503`	`{`
`2504`	`2504`	`double adfTOWGS84[7];`
	`2505`	`+ const char *pszSRSName = poSRSNonConst->GetName();`
`2505`	`2506`	`if (CPLTestBool(`
`2506`	`2507`	`CPLGetConfigOption("USE_OSR_FIND_MATCHES", "YES")) &&`
`2507`	`2508`	`// Below works around bug fixed in PROJ per`
`2508`	`2509`	`// https://github.com/OSGeo/PROJ/pull/4599`
`2509`		`- !(strstr(poSRSNonConst->GetName(), "NTF (Paris)") != nullptr &&`
	`2510`	`+ !(pszSRSName && strstr(pszSRSName, "NTF (Paris)") != nullptr &&`
`2510`	`2511`	`poSRSNonConst->GetTOWGS84(adfTOWGS84) == OGRERR_NONE))`
`2511`	`2512`	`{`
`2512`	`2513`	`auto poSRSMatch = poSRSNonConst->FindBestMatch();`