Merge pull request OSGeo#9379 from rouault/fix_9352

ERS: avoid 'Attempt at recursively opening ERS dataset' when the .ers file references a .ecw (fixes OSGeo#9352)
rouault · Mar 5, 2024 · d7075c8 · d7075c8
2 parents fe3cf27 + 717f746
commit d7075c8
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 5 deletions.
diff --git a/autotest/gdrivers/data/ers/references_ecw.ecw b/autotest/gdrivers/data/ers/references_ecw.ecw
diff --git a/autotest/gdrivers/data/ers/references_ecw.ers b/autotest/gdrivers/data/ers/references_ecw.ers
@@ -0,0 +1,14 @@
+DatasetHeader Begin
+	Version		= "6.2"
+	Name		= "references_ecw.ers"
+	DataFile	= "references_ecw.ecw"
+	DataSetType	= Translated
+	DataType	= Raster
+	ByteOrder	= LSBFirst
+	RasterInfo Begin
+		CellType	= Unsigned8BitInteger
+		NrOfLines	= 512
+		NrOfCellsPerLine	= 519
+		NrOfBands	= 1
+	RasterInfo End
+DatasetHeader End
diff --git a/autotest/gdrivers/ers.py b/autotest/gdrivers/ers.py
@@ -319,6 +319,16 @@ def test_ers_recursive_opening():
         ds.GetFileList()
 
 
+###############################################################################
+# Test fix for https://github.com/OSGeo/gdal/issues/9352
+
+
+@pytest.mark.require_driver("ECW")
+def test_ers_open_data_file_ecw():
+
+    assert gdal.Open("data/ers/references_ecw.ers")
+
+
 ###############################################################################
 # Cleanup
 

diff --git a/frmts/ers/ersdataset.cpp b/frmts/ers/ersdataset.cpp
@@ -881,17 +881,18 @@ int ERSProxyRasterBand::GetOverviewCount()
 GDALDataset *ERSDataset::Open(GDALOpenInfo *poOpenInfo)
 
 {
+    if (!Identify(poOpenInfo) || poOpenInfo->fpL == nullptr)
+        return nullptr;
+
+    int &nRecLevel = GetRecLevel();
     // cppcheck-suppress knownConditionTrueFalse
-    if (GetRecLevel())
+    if (nRecLevel)
     {
         CPLError(CE_Failure, CPLE_AppDefined,
                  "Attempt at recursively opening ERS dataset");
         return nullptr;
     }
 
-    if (!Identify(poOpenInfo) || poOpenInfo->fpL == nullptr)
-        return nullptr;
-
     /* -------------------------------------------------------------------- */
     /*      Ingest the file as a tree of header nodes.                      */
     /* -------------------------------------------------------------------- */
@@ -1020,7 +1021,6 @@ GDALDataset *ERSDataset::Open(GDALOpenInfo *poOpenInfo)
     /* -------------------------------------------------------------------- */
     if (EQUAL(poHeader->Find("DataSetType", ""), "Translated"))
     {
-        int &nRecLevel = GetRecLevel();
         nRecLevel++;
         poDS->poDepFile = GDALDataset::FromHandle(
             GDALOpen(osDataFilePath, poOpenInfo->eAccess));