Merge pull request #9154 from rouault/coverity_fixes

2 Coverity fixes
OSGeo · Jan 29, 2024 · a23fbee · a23fbee
2 parents 64cfe0c + 43dd934
commit a23fbee
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/apps/gdaltindex_lib.cpp b/apps/gdaltindex_lib.cpp
@@ -1000,13 +1000,13 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
                     if (poSrcSRS->exportToProj4(&pszProj4) == OGRERR_NONE)
                     {
                         poFeature->SetField(i_SrcSRSName, pszProj4);
-                        CPLFree(pszProj4);
                     }
                     else
                     {
                         poFeature->SetField(i_SrcSRSName,
                                             poSrcDS->GetProjectionRef());
                     }
+                    CPLFree(pszProj4);
                 }
             }
             else if (psOptions->eSrcSRSFormat == FORMAT_WKT)
@@ -1031,8 +1031,8 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
                 if (poSrcSRS->exportToProj4(&pszProj4) == OGRERR_NONE)
                 {
                     poFeature->SetField(i_SrcSRSName, pszProj4);
-                    CPLFree(pszProj4);
                 }
+                CPLFree(pszProj4);
             }
             else if (psOptions->eSrcSRSFormat == FORMAT_EPSG)
             {

diff --git a/frmts/gtiff/gt_wkt_srs.cpp b/frmts/gtiff/gt_wkt_srs.cpp
@@ -3703,20 +3703,22 @@ CPLErr GTIFMemBufFromSRS(OGRSpatialReferenceH hSRS,
     {
         hGTIF = GTIFNew(hTIFF);
         if (hGTIF)
+        {
             GTIFAttachPROJContext(hGTIF, OSRGetProjTLSContext());
 
-        if (hSRS != nullptr)
-            GTIFSetFromOGISDefnEx(hGTIF, hSRS, GEOTIFF_KEYS_STANDARD,
-                                  GEOTIFF_VERSION_1_0);
+            if (hSRS != nullptr)
+                GTIFSetFromOGISDefnEx(hGTIF, hSRS, GEOTIFF_KEYS_STANDARD,
+                                      GEOTIFF_VERSION_1_0);
 
-        if (bPixelIsPoint)
-        {
-            GTIFKeySet(hGTIF, GTRasterTypeGeoKey, TYPE_SHORT, 1,
-                       RasterPixelIsPoint);
-        }
+            if (bPixelIsPoint)
+            {
+                GTIFKeySet(hGTIF, GTRasterTypeGeoKey, TYPE_SHORT, 1,
+                           RasterPixelIsPoint);
+            }
 
-        GTIFWriteKeys(hGTIF);
-        GTIFFree(hGTIF);
+            GTIFWriteKeys(hGTIF);
+            GTIFFree(hGTIF);
+        }
     }
 
     /* -------------------------------------------------------------------- */