From 27f33d451b52e2d0cfd8ff8b0e86c3b2081ec675 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Sun, 5 Jan 2025 00:49:23 +0100 Subject: [PATCH 1/3] Fix -Wnull-dereference warnings in -O2 -DDEBUG mode --- frmts/gti/gdaltileindexdataset.cpp | 1 + ogr/ogrsf_frmts/pg/ogrpglayer.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/frmts/gti/gdaltileindexdataset.cpp b/frmts/gti/gdaltileindexdataset.cpp index 3877324665f8..2f4581c9ee55 100644 --- a/frmts/gti/gdaltileindexdataset.cpp +++ b/frmts/gti/gdaltileindexdataset.cpp @@ -4122,6 +4122,7 @@ void GDALTileIndexDataset::InitBuffer(void *pData, int nBufXSize, int nBufYSize, nBandNr == 0 ? m_poMaskBand.get() : cpl::down_cast(papoBands[nBandNr - 1]); + CPLAssert(poVRTBand); const double dfNoData = poVRTBand->m_dfNoDataValue; if (dfNoData == 0.0) { diff --git a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp index 5e98b1113105..05f4685fd16d 100644 --- a/ogr/ogrsf_frmts/pg/ogrpglayer.cpp +++ b/ogr/ogrsf_frmts/pg/ogrpglayer.cpp @@ -1943,9 +1943,12 @@ OGRErr OGRPGLayer::GetExtent(int iGeomField, OGREnvelope *psExtent, int bForce) OGRErr OGRPGLayer::GetExtent3D(int iGeomField, OGREnvelope3D *psExtent3D, int bForce) { + auto poLayerDefn = GetLayerDefn(); + // If the geometry field is not 3D go for 2D - if (GetLayerDefn()->GetGeomFieldCount() > iGeomField && - !OGR_GT_HasZ(GetLayerDefn()->GetGeomFieldDefn(iGeomField)->GetType())) + if (poLayerDefn->GetGeomFieldCount() > iGeomField && + !OGR_GT_HasZ(CPLAssertNotNull(poLayerDefn->GetGeomFieldDefn(iGeomField)) + ->GetType())) { const OGRErr retVal{GetExtent(iGeomField, psExtent3D, bForce)}; psExtent3D->MinZ = std::numeric_limits::infinity(); @@ -1955,8 +1958,8 @@ OGRErr OGRPGLayer::GetExtent3D(int iGeomField, OGREnvelope3D *psExtent3D, CPLString osCommand; - if (iGeomField < 0 || iGeomField >= GetLayerDefn()->GetGeomFieldCount() || - CPLAssertNotNull(GetLayerDefn()->GetGeomFieldDefn(iGeomField)) + if (iGeomField < 0 || iGeomField >= poLayerDefn->GetGeomFieldCount() || + CPLAssertNotNull(poLayerDefn->GetGeomFieldDefn(iGeomField)) ->GetType() == wkbNone) { if (iGeomField != 0) @@ -1968,7 +1971,7 @@ OGRErr OGRPGLayer::GetExtent3D(int iGeomField, OGREnvelope3D *psExtent3D, } OGRPGGeomFieldDefn *poGeomFieldDefn = - poFeatureDefn->GetGeomFieldDefn(iGeomField); + poLayerDefn->GetGeomFieldDefn(iGeomField); if (TestCapability(OLCFastGetExtent3D)) { From 046c208af8e2fe6730bfff07ba03107ef5a41f33 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 6 Jan 2025 15:42:45 +0100 Subject: [PATCH 2/3] Fix CPLFormFilename(absolute_path, ../something, NULL) to strip the relative path --- autotest/cpp/test_cpl.cpp | 15 ++++++++ port/cpl_path.cpp | 81 ++++++++++++++++++++++++++++----------- port/cpl_vsil.cpp | 2 +- 3 files changed, 74 insertions(+), 24 deletions(-) diff --git a/autotest/cpp/test_cpl.cpp b/autotest/cpp/test_cpl.cpp index 046116e2fbb2..038e0fef80d7 100644 --- a/autotest/cpp/test_cpl.cpp +++ b/autotest/cpp/test_cpl.cpp @@ -1048,6 +1048,21 @@ TEST_F(test_cpl, CPLFormFilename) EXPECT_TRUE( EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:/..") || EQUAL(CPLFormFilename("\\\\$\\c:", "..", nullptr), "\\\\$\\c:\\..")); + EXPECT_STREQ(CPLFormFilename("/a", "../", nullptr), "/"); + EXPECT_STREQ(CPLFormFilename("/a/", "../", nullptr), "/"); + EXPECT_STREQ(CPLFormFilename("/a", "../b", nullptr), "/b"); + EXPECT_STREQ(CPLFormFilename("/a/", "../b", nullptr), "/b"); + EXPECT_STREQ(CPLFormFilename("/a", "../b/c", nullptr), "/b/c"); + EXPECT_STREQ(CPLFormFilename("/a/", "../b/c/d", nullptr), "/b/c/d"); + EXPECT_STREQ(CPLFormFilename("/a/b", "../../c", nullptr), "/c"); + EXPECT_STREQ(CPLFormFilename("/a/b/", "../../c/d", nullptr), "/c/d"); + EXPECT_STREQ(CPLFormFilename("/a/b", "../..", nullptr), "/"); + EXPECT_STREQ(CPLFormFilename("/a/b", "../../", nullptr), "/"); + EXPECT_STREQ(CPLFormFilename("/a/b/c", "../../d", nullptr), "/a/d"); + EXPECT_STREQ(CPLFormFilename("/a/b/c/", "../../d", nullptr), "/a/d"); + // we could also just error out, but at least this preserves the original + // semantics + EXPECT_STREQ(CPLFormFilename("/a", "../../b", nullptr), "/a/../../b"); EXPECT_STREQ( CPLFormFilename("/vsicurl/http://example.com?foo", "bar", nullptr), "/vsicurl/http://example.com/bar?foo"); diff --git a/port/cpl_path.cpp b/port/cpl_path.cpp index ee4ab5762911..8be5c27d71dc 100644 --- a/port/cpl_path.cpp +++ b/port/cpl_path.cpp @@ -578,6 +578,7 @@ const char *CPLResetExtension(const char *pszPath, const char *pszExt) * CPLFormFilename(NULL,"def", NULL ) == "def" * CPLFormFilename(NULL, "abc/def.dat", NULL ) == "abc/def.dat" * CPLFormFilename("/abc/xyz/", "def.dat", NULL ) == "/abc/xyz/def.dat" + * CPLFormFilename("/a/b/c", "../d", NULL ) == "/a/b/d" (since 3.10.1) * \endcode * * @param pszPath directory path to the directory containing the file. This @@ -631,33 +632,67 @@ const char *CPLFormFilename(const char *pszPath, const char *pszBasename, pszAddedPathSep = "/"; } - if (!CPLIsFilenameRelative(pszPath) && strcmp(pszBasename, "..") == 0) + if (!CPLIsFilenameRelative(pszPath) && pszBasename[0] == '.' && + pszBasename[1] == '.' && + (pszBasename[2] == 0 || pszBasename[2] == '\\' || + pszBasename[2] == '/')) { - // /a/b + .. --> /a + // "/a/b/" + "..[/something]" --> "/a[/something]" + // "/a/b" + "..[/something]" --> "/a[/something]" if (pszPath[nLenPath - 1] == '\\' || pszPath[nLenPath - 1] == '/') nLenPath--; - size_t nLenPathOri = nLenPath; - while (nLenPath > 0 && pszPath[nLenPath - 1] != '\\' && - pszPath[nLenPath - 1] != '/') + while (true) { - nLenPath--; - } - if (nLenPath == 1 && pszPath[0] == '/') - { - pszBasename = ""; - } - else if ((nLenPath > 1 && pszPath[0] == '/') || - (nLenPath > 2 && pszPath[1] == ':') || - (nLenPath > 6 && strncmp(pszPath, "\\\\$\\", 4) == 0)) - { - nLenPath--; - pszBasename = ""; - } - else - { - nLenPath = nLenPathOri; - if (pszAddedPathSep[0] == 0) - pszAddedPathSep = VSIGetDirectorySeparator(pszPath); + const char *pszBasenameOri = pszBasename; + const size_t nLenPathOri = nLenPath; + while (nLenPath > 0 && pszPath[nLenPath - 1] != '\\' && + pszPath[nLenPath - 1] != '/') + { + nLenPath--; + } + if (nLenPath == 1 && pszPath[0] == '/') + { + pszBasename += 2; + if (pszBasename[0] == '/' || pszBasename[0] == '\\') + pszBasename++; + if (*pszBasename == '.') + { + pszBasename = pszBasenameOri; + nLenPath = nLenPathOri; + if (pszAddedPathSep[0] == 0) + pszAddedPathSep = + pszPath[0] == '/' + ? "/" + : VSIGetDirectorySeparator(pszPath); + } + break; + } + else if ((nLenPath > 1 && pszPath[0] == '/') || + (nLenPath > 2 && pszPath[1] == ':') || + (nLenPath > 6 && strncmp(pszPath, "\\\\$\\", 4) == 0)) + { + nLenPath--; + pszBasename += 2; + if ((pszBasename[0] == '/' || pszBasename[0] == '\\') && + pszBasename[1] == '.' && pszBasename[2] == '.') + { + pszBasename++; + } + else + { + break; + } + } + else + { + pszBasename = pszBasenameOri; + nLenPath = nLenPathOri; + if (pszAddedPathSep[0] == 0) + pszAddedPathSep = pszPath[0] == '/' + ? "/" + : VSIGetDirectorySeparator(pszPath); + break; + } } } else if (nLenPath > 0 && pszPath[nLenPath - 1] != '/' && diff --git a/port/cpl_vsil.cpp b/port/cpl_vsil.cpp index df8cd588cde7..36aaaa7ca960 100644 --- a/port/cpl_vsil.cpp +++ b/port/cpl_vsil.cpp @@ -146,7 +146,7 @@ char **VSISiblingFiles(const char *pszFilename) /** Return the directory separator for the specified path. * * Default is forward slash. The only exception currently is the Windows - * file system which returns anti-slash, unless the specified path is of the + * file system which returns backslash, unless the specified path is of the * form "{drive_letter}:/{rest_of_the_path}". * * @since 3.9 From d35674efe77b3c0ae651ad60f7f6f82864dbdf8d Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 6 Jan 2025 17:15:53 +0100 Subject: [PATCH 3/3] vrt_processed_dataset.rst: add missing word --- doc/source/drivers/raster/vrt_processed_dataset.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/drivers/raster/vrt_processed_dataset.rst b/doc/source/drivers/raster/vrt_processed_dataset.rst index 085b3c297a18..28f001904af7 100644 --- a/doc/source/drivers/raster/vrt_processed_dataset.rst +++ b/doc/source/drivers/raster/vrt_processed_dataset.rst @@ -139,7 +139,7 @@ defined as a child element of ``VRTDataset``, with the following 2 attributes: returned by the initialization function of the last step, or an integer value. * ``dataType`` whose value can be ``FROM_SOURCE`` to indicate that the output band - data type must be the same as one of the input dataset, + data type must be the same as the one of the input dataset, ``FROM_LAST_STEP`` to indicate that it must be the one returned by the initialization function of the last step, or a value among Byte, Int8, UInt16, Int16, UInt32, Int32, UInt64, Int64, Float32, Float64, CInt16, CInt32, CFloat32 or CFloat64