Merge pull request #10824 from rouault/fix_10821

/vsitar/: fix support of /vsitar/ of /vsitar/
OSGeo · Sep 18, 2024 · c8a0113 · c8a0113
2 parents e5bb066 + eff841f
commit c8a0113
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/autotest/gcore/data/tar_of_tar_gzip.tar b/autotest/gcore/data/tar_of_tar_gzip.tar
diff --git a/autotest/gcore/vsifile.py b/autotest/gcore/vsifile.py
@@ -701,6 +701,15 @@ def test_vsifile_14():
         )
 
 
+###############################################################################
+# Test bugfix for https://github.com/OSGeo/gdal/issues/10821
+
+
+def test_vsifile_vsitar_of_vsitar():
+
+    gdal.Open("/vsitar/{/vsitar/data/tar_of_tar_gzip.tar}/byte_tif.tar.gz/byte.tif")
+
+
 ###############################################################################
 # Test issue with Error() not detecting end of corrupted gzip stream (#6944)
 

diff --git a/port/cpl_vsil_gzip.cpp b/port/cpl_vsil_gzip.cpp
@@ -960,10 +960,12 @@ bool VSIGZipHandle::gzseek(vsi_l_offset offset, int whence)
     {
         m_uncompressed_size = out;
 
-        if (m_pszBaseFileName &&
-            !STARTS_WITH_CI(m_pszBaseFileName, "/vsicurl/") &&
-            m_bWriteProperties)
+        if (m_pszBaseFileName && !STARTS_WITH(m_pszBaseFileName, "/vsicurl/") &&
+            !STARTS_WITH(m_pszBaseFileName, "/vsitar/") &&
+            !STARTS_WITH(m_pszBaseFileName, "/vsizip/") && m_bWriteProperties)
         {
+            CPLErrorStateBackuper oErrorStateBackuper(CPLQuietErrorHandler);
+
             CPLString osCacheFilename(m_pszBaseFileName);
             osCacheFilename += ".properties";