[pull] master from OSGeo:master

.github/workflows/cmake_builds.yml

@@ -548,7 +548,7 @@ jobs:
         ctest --test-dir $GITHUB_WORKSPACE/build -C RelWithDebInfo -V -j 3
       env:
         SKIP_GDAL_HTTP_SSL_VERIFYSTATUS: YES
-        BUILD_NAME: "build-windows-conda"
+        BUILD_NAME: "build-windows-minimum"
     - name: Show gdal.pc
       shell: bash -l {0}
       run: cat $GITHUB_WORKSPACE/build/gdal.pc

.github/workflows/codeql.yml

@@ -0,0 +1,149 @@
+name: "CodeQL"
+
+on:
+  push:
+  pull_request:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.ref }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+
+jobs:
+  analyze:
+    name: Analyze
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners
+    # Consider using larger runners for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    timeout-minutes: ${{ (matrix.language == 'swift' && 120) || 360 }}
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'c-cpp' ]
+        # CodeQL supports [ 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift' ]
+        # Use only 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use only 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # Learn more about CodeQL language support at https://aka.ms/codeql-docs/language-support
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v4
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+
+        # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+        # queries: security-extended,security-and-quality
+        config: |
+          query-filters:
+            - exclude:
+                id: cpp/non-https-url
+
+    - name: Install dependencies
+      run: |
+          sudo apt-get install -y ccache cmake g++ swig python3-numpy libproj-dev libqhull-dev
+          sudo apt-get install -y \
+            libblosc-dev \
+            libboost-dev \
+            libcairo2-dev \
+            libcfitsio-dev \
+            libcrypto++-dev \
+            libcurl4-gnutls-dev \
+            libexpat-dev \
+            libfcgi-dev \
+            libfyba-dev \
+            libfreexl-dev \
+            libgeos-dev \
+            libgeotiff-dev \
+            libgif-dev \
+            libhdf5-serial-dev \
+            libjpeg-dev \
+            libkml-dev \
+            liblcms2-2 \
+            liblz4-dev \
+            liblzma-dev \
+            libmysqlclient-dev \
+            libnetcdf-dev \
+            libogdi-dev \
+            libopenexr-dev \
+            libopenjp2-7-dev \
+            libpcre3-dev \
+            libpng-dev \
+            libpoppler-dev \
+            libpoppler-private-dev \
+            libpq-dev \
+            libproj-dev \
+            librasterlite2-dev \
+            libspatialite-dev \
+            libssl-dev \
+            libwebp-dev \
+            libxerces-c-dev \
+            libxml2-dev \
+            libxslt-dev \
+            libzstd-dev \
+            unixodbc-dev
+
+    # cache the .ccache directory
+    # key it on the runner os, build type, deps, and arch
+    # It's especially important to include arch in the key because we
+    # may get runtime errors with -mavx2 from objects built on a
+    # different architecture.
+    - name: Restore build cache
+      if: matrix.language == 'c-cpp'
+      id: restore-cache
+      uses: actions/cache/restore@v3
+      with:
+        path: ${{ github.workspace }}/.ccache
+        key: ${{ matrix.id }}-${{ steps.get-arch.outputs.arch }}-${{ github.ref_name }}-${{ github.run_id }}
+        restore-keys: |
+          ${{ matrix.id }}-${{ steps.get-arch.outputs.arch }}-${{ github.ref_name }}
+          ${{ matrix.id }}-${{ steps.get-arch.outputs.arch }}
+
+    - name: Configure ccache
+      if: matrix.language == 'c-cpp'
+      run: |
+          echo CCACHE_BASEDIR=${{ github.workspace }} >> ${GITHUB_ENV}
+          echo CCACHE_DIR=${{ github.workspace }}/.ccache >> ${GITHUB_ENV}
+          echo CCACHE_MAXSIZE=250M >> ${GITHUB_ENV}
+          ccache -z
+
+    - name: Build
+      if: matrix.language == 'c-cpp'
+      run: |
+          mkdir build
+          cd build
+          cmake .. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DUSE_CCACHE=YES -DGDAL_USE_LERC_INTERNAL=OFF
+          make -j$(nproc)
+
+    - name: Summarize ccache
+      if: matrix.language == 'c-cpp'
+      run: |
+        ccache -s
+
+    - name: Save build cache
+      if: matrix.language == 'c-cpp'
+      uses: actions/cache/save@v3
+      with:
+        path: ${{ github.workspace }}/.ccache
+        key: ${{ steps.restore-cache.outputs.cache-primary-key }}
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:${{matrix.language}}"

CITATION

@@ -1,6 +1,6 @@
 To cite GDAL/OGR in publications use:
 
-  GDAL/OGR contributors (2023). GDAL/OGR Geospatial Data Abstraction
+  GDAL/OGR contributors (2024). GDAL/OGR Geospatial Data Abstraction
   software Library. Open Source Geospatial Foundation. URL https://gdal.org
   DOI: 10.5281/zenodo.5884351
 
@@ -10,7 +10,7 @@ A BibTeX entry for LaTeX users is
     title = {{GDAL/OGR} Geospatial Data Abstraction software Library},
     author = {{GDAL/OGR contributors}},
     organization = {Open Source Geospatial Foundation},
-    year = {2023},
+    year = {2024},
     url = {https://gdal.org},
     doi = {10.5281/zenodo.5884351},
   }

CITATION.cff

@@ -2,8 +2,8 @@ cff-version: 1.2.0
 message: Please cite this software using these metadata or in the CITATION file.
 type: software
 title: GDAL
-version: 3.8.0
-date-released: 2023-11-06
+version: 3.8.3
+date-released: 2024-01-02
 doi: 10.5281/zenodo.5884351
 abstract: GDAL is a translator library for raster and vector geospatial data
   formats that is released under an MIT style Open Source License by the Open

README.md

@@ -14,6 +14,7 @@ GDAL - Geospatial Data Abstraction Library
 [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/gdal.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:gdal)
 [![Coverage Status](https://coveralls.io/repos/github/OSGeo/gdal/badge.svg?branch=master)](https://coveralls.io/github/OSGeo/gdal?branch=master)
 [![OpenSSF Best Practices](https://www.bestpractices.dev/projects/8250/badge)](https://www.bestpractices.dev/projects/8250)
+[![OpenSSF Scorecard](https://api.securityscorecards.dev/projects/github.com/OSGeo/gdal/badge)](https://securityscorecards.dev/viewer/?uri=github.com/OSGeo/gdal)
 
 [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.5884351.svg)](https://doi.org/10.5281/zenodo.5884351)
 

alg/gdal_crs.cpp

@@ -754,7 +754,8 @@ static int calccoef(struct Control_Points *cp, double x_mean, double y_mean,
 
     /* INITIALIZE MATRIX */
 
-    m.v = static_cast<double *>(VSICalloc(m.n * m.n, sizeof(double)));
+    m.v = static_cast<double *>(
+        VSICalloc(cpl::fits_on<int>(m.n * m.n), sizeof(double)));
     if (m.v == nullptr)
     {
         return (MMEMERR);

alg/gdal_rpc.cpp

@@ -1666,7 +1666,7 @@ GDALRPCTransformWholeLineWithDEM(const GDALRPCTransformInfo *psTransform,
                                  int nXWidth, int nYTop, int nYHeight)
 {
     double *padfDEMBuffer = static_cast<double *>(
-        VSI_MALLOC2_VERBOSE(sizeof(double), nXWidth * nYHeight));
+        VSI_MALLOC3_VERBOSE(sizeof(double), nXWidth, nYHeight));
     if (padfDEMBuffer == nullptr)
     {
         for (int i = 0; i < nPointCount; i++)

alg/gdal_simplesurf.cpp

@@ -190,9 +190,16 @@ CPLErr GDALSimpleSURF::ConvertRGBToLuminosity(GDALRasterBand *red,
     const int dataGreenSize = GDALGetDataTypeSizeBytes(eGreenType);
     const int dataBlueSize = GDALGetDataTypeSizeBytes(eBlueType);
 
-    void *paRedLayer = CPLMalloc(dataRedSize * nWidth * nHeight);
-    void *paGreenLayer = CPLMalloc(dataGreenSize * nWidth * nHeight);
-    void *paBlueLayer = CPLMalloc(dataBlueSize * nWidth * nHeight);
+    void *paRedLayer = VSI_MALLOC3_VERBOSE(dataRedSize, nWidth, nHeight);
+    void *paGreenLayer = VSI_MALLOC3_VERBOSE(dataGreenSize, nWidth, nHeight);
+    void *paBlueLayer = VSI_MALLOC3_VERBOSE(dataBlueSize, nWidth, nHeight);
+    if (!paRedLayer || !paGreenLayer || !paBlueLayer)
+    {
+        CPLFree(paRedLayer);
+        CPLFree(paGreenLayer);
+        CPLFree(paBlueLayer);
+        return CE_Failure;
+    }
 
     CPLErr eErr = red->RasterIO(GF_Read, 0, 0, nXSize, nYSize, paRedLayer,
                                 nWidth, nHeight, eRedType, 0, 0, nullptr);

alg/gdaldither.cpp

@@ -263,7 +263,8 @@ int GDALDitherRGB2PCTInternal(
     /* -------------------------------------------------------------------- */
     /*      Setup various variables.                                        */
     /* -------------------------------------------------------------------- */
-    int nCLevels = 1 << nBits;
+    const int nCLevels = 1 << nBits;
+    const int nCLevelsCube = nCLevels * nCLevels * nCLevels;
     ColorIndex *psColorIndexMap = nullptr;
 
     GByte *pabyRed = static_cast<GByte *>(VSI_MALLOC_VERBOSE(nXSize));
@@ -297,7 +298,7 @@ int GDALDitherRGB2PCTInternal(
          */
 
         pabyColorMap = static_cast<GByte *>(
-            VSI_MALLOC_VERBOSE(nCLevels * nCLevels * nCLevels * sizeof(GByte)));
+            VSI_MALLOC_VERBOSE(nCLevelsCube * sizeof(GByte)));
         if (pabyColorMap == nullptr)
         {
             CPLFree(pabyRed);

alg/gdallinearsystem.h

@@ -59,12 +59,12 @@ struct GDALMatrix
     /// Returns the reference to the element at the position \a row, \a col.
     inline double &operator()(int row, int col)
     {
-        return v[row + col * n_rows];
+        return v[row + col * static_cast<size_t>(n_rows)];
     }
     /// Returns the element at the position \a row, \a col by value.
     inline double operator()(int row, int col) const
     {
-        return v[row + col * n_rows];
+        return v[row + col * static_cast<size_t>(n_rows)];
     }
     /// Returns the values of the matrix in column major order.
     double const *data() const
@@ -82,7 +82,7 @@ struct GDALMatrix
         n_rows = iRows;
         n_cols = iCols;
         v.clear();
-        v.resize(iRows * iCols);
+        v.resize(static_cast<size_t>(iRows) * iCols);
     }
 
   private:

alg/gdalmediancut.cpp

@@ -359,6 +359,7 @@ int GDALComputeMedianCutPCTInternal(
     }
 
     const int nCLevels = 1 << nBits;
+    const int nCLevelsCube = nCLevels * nCLevels * nCLevels;
     T *histogram = nullptr;
     HashHistogram *psHashHistogram = nullptr;
     if (panHistogram)
@@ -376,13 +377,13 @@ int GDALComputeMedianCutPCTInternal(
         else
         {
             histogram = panHistogram;
-            memset(histogram, 0, nCLevels * nCLevels * nCLevels * sizeof(T));
+            memset(histogram, 0, nCLevelsCube * sizeof(T));
         }
     }
     else
     {
-        histogram = static_cast<T *>(
-            VSI_CALLOC_VERBOSE(nCLevels * nCLevels * nCLevels, sizeof(T)));
+        histogram =
+            static_cast<T *>(VSI_CALLOC_VERBOSE(nCLevelsCube, sizeof(T)));
         if (histogram == nullptr)
         {
             return CE_Failure;

alg/gdalpansharpen.cpp

@@ -1187,7 +1187,8 @@ CPLErr GDALPansharpenOperation::ProcessRegion(int nXOff, int nYOff, int nXSize,
 #endif
     const int nDataTypeSize = GDALGetDataTypeSizeBytes(eWorkDataType);
     GByte *pUpsampledSpectralBuffer = static_cast<GByte *>(VSI_MALLOC3_VERBOSE(
-        nXSize, nYSize, psOptions->nInputSpectralBands * nDataTypeSize));
+        nXSize, nYSize,
+        cpl::fits_on<int>(psOptions->nInputSpectralBands * nDataTypeSize)));
     GByte *pPanBuffer = static_cast<GByte *>(
         VSI_MALLOC3_VERBOSE(nXSize, nYSize, nDataTypeSize));
     if (pUpsampledSpectralBuffer == nullptr || pPanBuffer == nullptr)
@@ -1266,7 +1267,7 @@ CPLErr GDALPansharpenOperation::ProcessRegion(int nXOff, int nYOff, int nXSize,
 
         GByte *pSpectralBuffer = static_cast<GByte *>(VSI_MALLOC3_VERBOSE(
             nXSizeExtract, nYSizeExtract,
-            psOptions->nInputSpectralBands * nDataTypeSize));
+            cpl::fits_on<int>(psOptions->nInputSpectralBands * nDataTypeSize)));
         if (pSpectralBuffer == nullptr)
         {
             VSIFree(pUpsampledSpectralBuffer);

alg/gdalproximity.cpp

@@ -582,7 +582,8 @@ static CPLErr ProcessProximityLine(GInt32 *panSrcScanline, int *panNearX,
              panSrcScanline[iPixel] != *pdfSrcNoDataValue) &&
             dfNearDistSq <= dfMaxDist * dfMaxDist &&
             (pafProximity[iPixel] < 0 ||
-             dfNearDistSq < pafProximity[iPixel] * pafProximity[iPixel]))
+             dfNearDistSq < static_cast<double>(pafProximity[iPixel]) *
+                                pafProximity[iPixel]))
             pafProximity[iPixel] = static_cast<float>(sqrt(dfNearDistSq));
     }
 

alg/gdalwarpoperation.cpp

@@ -689,8 +689,9 @@ void *GDALWarpOperation::CreateDestinationBuffer(int nDstXSize, int nDstYSize,
     /* -------------------------------------------------------------------- */
     const int nWordSize = GDALGetDataTypeSizeBytes(psOptions->eWorkingDataType);
 
-    void *pDstBuffer = VSI_MALLOC3_VERBOSE(nWordSize * psOptions->nBandCount,
-                                           nDstXSize, nDstYSize);
+    void *pDstBuffer = VSI_MALLOC3_VERBOSE(
+        cpl::fits_on<int>(nWordSize * psOptions->nBandCount), nDstXSize,
+        nDstYSize);
     if (pDstBuffer == nullptr)
     {
         return nullptr;