Merge pull request #11643 from rouault/coverity_fixes

Address medium and high severity new Coverity fixes
OSGeo · Jan 13, 2025 · 493ed18 · 493ed18
2 parents 11ff175 + cb061ec
commit 493ed18
Show file tree

Hide file tree

Showing 25 changed files with 195 additions and 141 deletions.
diff --git a/alg/gdalwarpkernel.cpp b/alg/gdalwarpkernel.cpp
@@ -4383,7 +4383,9 @@ static void GWKComputeWeights(GDALResampleAlg eResample, int iMin, int iMax,
 
     int i = iMin;  // Used after for.
     int iC = 0;    // Used after for.
-    double dfAccumulatorWeightHorizontal = 0.0;
+    // Not zero, but as close as possible to it, to avoid potential division by
+    // zero at end of function
+    double dfAccumulatorWeightHorizontal = std::numeric_limits<double>::min();
     for (; i + 2 < iMax; i += 4, iC += 4)
     {
         padfWeightsHorizontal[iC] = (i - dfDeltaX) * dfXScale;
@@ -4404,7 +4406,9 @@ static void GWKComputeWeights(GDALResampleAlg eResample, int iMin, int iMax,
 
     int j = jMin;  // Used after for.
     int jC = 0;    // Used after for.
-    double dfAccumulatorWeightVertical = 0.0;
+    // Not zero, but as close as possible to it, to avoid potential division by
+    // zero at end of function
+    double dfAccumulatorWeightVertical = std::numeric_limits<double>::min();
     for (; j + 2 < jMax; j += 4, jC += 4)
     {
         padfWeightsVertical[jC] = (j - dfDeltaY) * dfYScale;

diff --git a/apps/gdal_rasterize_lib.cpp b/apps/gdal_rasterize_lib.cpp
@@ -842,12 +842,20 @@ static GDALDatasetH CreateOutputDataset(
         sEnvelop.MaxY = ceil(sEnvelop.MaxY / dfYRes) * dfYRes;
     }
 
+    if (dfXRes == 0 || dfYRes == 0)
+    {
+        CPLError(CE_Failure, CPLE_AppDefined, "Could not determine bounds");
+        return nullptr;
+    }
+
     double adfProjection[6] = {sEnvelop.MinX, dfXRes, 0.0,
                                sEnvelop.MaxY, 0.0,    -dfYRes};
 
     if (nXSize == 0 && nYSize == 0)
     {
+        // coverity[divide_by_zero]
         const double dfXSize = 0.5 + (sEnvelop.MaxX - sEnvelop.MinX) / dfXRes;
+        // coverity[divide_by_zero]
         const double dfYSize = 0.5 + (sEnvelop.MaxY - sEnvelop.MinY) / dfYRes;
         if (dfXSize > std::numeric_limits<int>::max() ||
             dfXSize < std::numeric_limits<int>::min() ||

diff --git a/apps/gdal_translate_lib.cpp b/apps/gdal_translate_lib.cpp
@@ -1277,7 +1277,7 @@ GDALDatasetH GDALTranslate(const char *pszDest, GDALDatasetH hSrcDataset,
     const bool bOutsizeExplicitlySet =
         !(psOptions->nOXSizePixel == 0 && psOptions->dfOXSizePct == 0.0 &&
           psOptions->nOYSizePixel == 0 && psOptions->dfOYSizePct == 0.0);
-    if (psOptions->dfXRes != 0.0)
+    if (psOptions->dfXRes != 0.0 && psOptions->dfYRes != 0.0)
     {
         if (!(bHasSrcGeoTransform && psOptions->nGCPCount == 0 &&
               adfSrcGeoTransform[2] == 0.0 && adfSrcGeoTransform[4] == 0.0))

diff --git a/apps/gdaladdo.cpp b/apps/gdaladdo.cpp
@@ -481,6 +481,7 @@ static bool PartialRefreshFromSourceExtent(
         }
         double dfNextCurPixels =
             dfCurPixels + static_cast<double>(region.nXSize) * region.nYSize;
+        // coverity[divide_by_zero]
         void *pScaledProgress = GDALCreateScaledProgress(
             dfCurPixels / dfTotalPixels, dfNextCurPixels / dfTotalPixels,
             pfnProgress, pProgressArg);

diff --git a/apps/gdalbuildvrt_lib.cpp b/apps/gdalbuildvrt_lib.cpp
@@ -127,6 +127,12 @@ static int GetSrcDstWin(DatasetProperty *psDP, double we_res, double ns_res,
                         double *pdfDstYOff, double *pdfDstXSize,
                         double *pdfDstYSize)
 {
+    if (we_res == 0 || ns_res == 0)
+    {
+        // should not happen. to please Coverity
+        return FALSE;
+    }
+
     /* Check that the destination bounding box intersects the source bounding
      * box */
     if (psDP->adfGeoTransform[GEOTRSFRM_TOPLEFT_X] +

diff --git a/apps/ogrlineref.cpp b/apps/ogrlineref.cpp
@@ -1093,7 +1093,13 @@ static OGRErr GetPosition(OGRLayer *const poPkLayer, double dfX, double dfY,
     // Get real distance
     const double dfRealDist = Project(pCloserPart, &pt);
     delete pCloserPart;
+    if (dfScale == 0)
+    {
+        fprintf(stderr, _("dfScale == 0.\n"));
+        return OGRERR_FAILURE;
+    }
     // Compute reference distance
+    // coverity[divide_by_zero]
     const double dfRefDist = dfBeg + dfRealDist / dfScale;
     if (bQuiet)
     {

diff --git a/frmts/envisat/EnvisatFile.c b/frmts/envisat/EnvisatFile.c
@@ -1807,16 +1807,20 @@ int S_NameValueList_Parse(const char *text, int text_offset, int *entry_count,
         /*
          * Add the entry to the name/value list.
          */
-        (*entry_count)++;
-        *entries = (EnvisatNameValue **)CPLRealloc(
-            *entries, *entry_count * sizeof(EnvisatNameValue *));
-
-        if (*entries == NULL)
+        EnvisatNameValue **newEntries = VSI_REALLOC_VERBOSE(
+            *entries, (*entry_count + 1) * sizeof(EnvisatNameValue *));
+        if (!newEntries)
         {
             *entry_count = 0;
+            CPLFree(entry->key);
+            CPLFree(entry->value);
+            CPLFree(entry->literal_line);
+            CPLFree(entry->units);
             CPLFree(entry);
             return FAILURE;
         }
+        (*entry_count)++;
+        *entries = newEntries;
 
         (*entries)[*entry_count - 1] = entry;
     }

diff --git a/frmts/gtiff/libgeotiff/geotiff_proj4.c b/frmts/gtiff/libgeotiff/geotiff_proj4.c
@@ -221,7 +221,7 @@ int GTIFSetFromProj4( GTIF *gtif, const char *proj4 )
         dfSemiMajor = OSR_GDV(papszNV,"a",0.0);
         dfSemiMinor = OSR_GDV(papszNV,"b",0.0);
         dfInvFlattening = OSR_GDV(papszNV,"rf",0.0);
-        if( dfSemiMinor != 0.0 && dfInvFlattening == 0.0 )
+        if( dfSemiMajor != 0.0 && dfSemiMinor != 0.0 && dfInvFlattening == 0.0 )
             dfInvFlattening = -1.0 / (dfSemiMinor/dfSemiMajor - 1.0);
     }
 

diff --git a/frmts/gxf/gxf_ogcwkt.c b/frmts/gxf/gxf_ogcwkt.c
@@ -247,7 +247,7 @@ static void OGCWKTSetProj(char *pszProjection, size_t nProjectionSize,
 char *GXFGetMapProjectionAsOGCWKT(GXFHandle hGXF)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     char **papszMethods = NULL;
     char szWKT[1024 + 32];
     char szGCS[512];

diff --git a/frmts/gxf/gxf_proj4.c b/frmts/gxf/gxf_proj4.c
@@ -54,7 +54,7 @@
 char *GXFGetMapProjectionAsPROJ4(GXFHandle hGXF)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     char **papszMethods = NULL;
     char szPROJ4[512] = {0};
 
@@ -563,7 +563,7 @@ CPLErr GXFGetPROJ4Position(GXFHandle hGXF, double *pdfXOrigin,
                            double *pdfYPixelSize, double *pdfRotation)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     char *pszProj;
 
     /* -------------------------------------------------------------------- */

diff --git a/frmts/gxf/gxfopen.c b/frmts/gxf/gxfopen.c
@@ -412,7 +412,7 @@ GXFHandle GXFOpen(const char *pszFilename)
 void GXFClose(GXFHandle hGXF)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
 
     CPLFree(psGXF->panRawLineOffset);
     CPLFree(psGXF->pszUnitName);
@@ -633,7 +633,7 @@ static CPLErr GXFReadRawScanlineFrom(GXFInfo_t *psGXF, vsi_l_offset iOffset,
 CPLErr GXFGetScanline(GXFHandle hGXF, int iScanline, double *padfLineBuf)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     CPLErr nErr;
     int iRawScanline;
 
@@ -698,7 +698,7 @@ CPLErr GXFGetScanline(GXFHandle hGXF, int iScanline, double *padfLineBuf)
 CPLErr GXFGetRawScanline(GXFHandle hGXF, int iScanline, double *padfLineBuf)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     CPLErr eErr;
 
     /* -------------------------------------------------------------------- */
@@ -754,7 +754,7 @@ CPLErr GXFGetRawScanline(GXFHandle hGXF, int iScanline, double *padfLineBuf)
 static void GXFScanForZMinMax(GXFHandle hGXF)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     int iLine, iPixel;
     double *padfScanline;
 
@@ -841,7 +841,7 @@ CPLErr GXFGetRawInfo(GXFHandle hGXF, int *pnXSize, int *pnYSize, int *pnSense,
                      double *pdfZMin, double *pdfZMax, double *pdfDummy)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
 
     if (pnXSize != NULL)
         *pnXSize = psGXF->nRawXSize;
@@ -889,7 +889,7 @@ CPLErr GXFGetRawInfo(GXFHandle hGXF, int *pnXSize, int *pnYSize, int *pnSense,
 char **GXFGetMapProjection(GXFHandle hGXF)
 
 {
-    return (((GXFInfo_t *)hGXF)->papszMapProjection);
+    return ((hGXF)->papszMapProjection);
 }
 
 /************************************************************************/
@@ -911,7 +911,7 @@ char **GXFGetMapProjection(GXFHandle hGXF)
 char **GXFGetMapDatumTransform(GXFHandle hGXF)
 
 {
-    return (((GXFInfo_t *)hGXF)->papszMapDatumTransform);
+    return ((hGXF)->papszMapDatumTransform);
 }
 
 /************************************************************************/
@@ -948,7 +948,7 @@ CPLErr GXFGetRawPosition(GXFHandle hGXF, double *pdfXOrigin, double *pdfYOrigin,
                          double *pdfRotation)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
 
     if (pdfXOrigin != NULL)
         *pdfXOrigin = psGXF->dfXOrigin;
@@ -1004,7 +1004,7 @@ CPLErr GXFGetPosition(GXFHandle hGXF, double *pdfXOrigin, double *pdfYOrigin,
                       double *pdfRotation)
 
 {
-    GXFInfo_t *psGXF = (GXFInfo_t *)hGXF;
+    GXFInfo_t *psGXF = hGXF;
     double dfCXOrigin, dfCYOrigin, dfCXPixelSize, dfCYPixelSize;
 
     switch (psGXF->nSense)

diff --git a/frmts/gxf/gxfopen.h b/frmts/gxf/gxfopen.h
@@ -26,9 +26,49 @@
 #include "cpl_conv.h"
 #include "cpl_string.h"
 
+/* -------------------------------------------------------------------- */
+/*      This is consider to be a private structure.                     */
+/* -------------------------------------------------------------------- */
+struct GXFInfo_t
+{
+    VSILFILE *fp;
+
+    int nRawXSize;
+    int nRawYSize;
+    int nSense; /* GXFS_ codes */
+    int nGType; /* 0 is uncompressed */
+
+    double dfXPixelSize;
+    double dfYPixelSize;
+    double dfRotation;
+    double dfXOrigin; /* lower left corner */
+    double dfYOrigin; /* lower left corner */
+
+    char szDummy[64];
+    double dfSetDummyTo;
+
+    char *pszTitle;
+
+    double dfTransformScale;
+    double dfTransformOffset;
+    char *pszTransformName;
+
+    char **papszMapProjection;
+    char **papszMapDatumTransform;
+
+    char *pszUnitName;
+    double dfUnitToMeter;
+
+    double dfZMaximum;
+    double dfZMinimum;
+
+    vsi_l_offset *panRawLineOffset;
+};
+typedef struct GXFInfo_t GXFInfo_t;
+
 CPL_C_START
 
-typedef void *GXFHandle;
+typedef struct GXFInfo_t *GXFHandle;
 
 GXFHandle GXFOpen(const char *pszFilename);
 
@@ -65,43 +105,4 @@ void GXFClose(GXFHandle hGXF);
 
 CPL_C_END
 
-/* -------------------------------------------------------------------- */
-/*      This is consider to be a private structure.                     */
-/* -------------------------------------------------------------------- */
-typedef struct
-{
-    VSILFILE *fp;
-
-    int nRawXSize;
-    int nRawYSize;
-    int nSense; /* GXFS_ codes */
-    int nGType; /* 0 is uncompressed */
-
-    double dfXPixelSize;
-    double dfYPixelSize;
-    double dfRotation;
-    double dfXOrigin; /* lower left corner */
-    double dfYOrigin; /* lower left corner */
-
-    char szDummy[64];
-    double dfSetDummyTo;
-
-    char *pszTitle;
-
-    double dfTransformScale;
-    double dfTransformOffset;
-    char *pszTransformName;
-
-    char **papszMapProjection;
-    char **papszMapDatumTransform;
-
-    char *pszUnitName;
-    double dfUnitToMeter;
-
-    double dfZMaximum;
-    double dfZMinimum;
-
-    vsi_l_offset *panRawLineOffset;
-} GXFInfo_t;
-
 #endif /* ndef GXFOPEN_H_INCLUDED */
diff --git a/frmts/ilwis/ilwisdataset.cpp b/frmts/ilwis/ilwisdataset.cpp
@@ -2153,7 +2153,9 @@ int ValueRange::iRaw(double rValueIn) const
 {
     if (rValueIn == rUNDEF)  // || !fContains(rValue))
         return iUNDEF;
-    const double rEpsilon = _rStep == 0.0 ? 1e-6 : _rStep / 3.0;
+    if (_rStep == 0.0)
+        return iUNDEF;
+    const double rEpsilon = _rStep / 3.0;
     if (rValueIn - get_rLo() < -rEpsilon)  // take a little rounding tolerance
         return iUNDEF;
     else if (rValueIn - get_rHi() >

diff --git a/frmts/mrf/marfa_dataset.cpp b/frmts/mrf/marfa_dataset.cpp
@@ -316,6 +316,12 @@ CPLErr MRFDataset::IBuildOverviews(const char *pszResampling, int nOverviews,
                                config, "Rsets.scale",
                                CPLOPrintf("%d", panOverviewList[0]).c_str()),
                            nullptr);
+                if (scale == 0.0)
+                {
+                    CPLError(CE_Failure, CPLE_IllegalArg,
+                             "Invalid Rsets.scale value");
+                    throw CE_Failure;
+                }
 
                 if (static_cast<int>(scale) != 2 &&
                     (EQUALN("Avg", pszResampling, 3) ||

diff --git a/frmts/mrf/mrf_band.cpp b/frmts/mrf/mrf_band.cpp
@@ -208,7 +208,10 @@ static int ZPack(const buf_mgr &src, buf_mgr &dst, int flags)
 
     err = deflateInit2(&stream, level, Z_DEFLATED, wb, memlevel, strategy);
     if (err != Z_OK)
+    {
+        deflateEnd(&stream);
         return err;
+    }
 
     err = deflate(&stream, Z_FINISH);
     if (err != Z_STREAM_END)