Merge pull request OSGeo#11498 from rouault/cppckeck_nullPointerOutOf…

…Memory

Fix cppcheck nullPointerOutOfMemory warnings

frmts/grib/degrib/degrib/degrib1.cpp

@@ -834,6 +834,11 @@ int GRIB1_RefTime (VSILFILE *fp, uInt4 gribLen, double *refTime)
       return -1;
    }
    pds = (uChar *) malloc (sectLen * sizeof (uChar));
+   if(!pds)
+   {
+       errSprintf("Out of memory");
+       return -1;
+   }
    *pds = *temp;
    pds[1] = temp[1];
    pds[2] = temp[2];

frmts/grib/degrib/degrib/metaparse.cpp

@@ -475,6 +475,10 @@ static int ParseSect2_Wx (float *rdat, sInt4 nrdat, sInt4 *idat,
 
    buffLen = 0;
    buffer = (char *) malloc ((nidat + 1) * sizeof (char));
+   if( !buffer ) {
+       errSprintf ("Out of memory\n");
+       return -1;
+   }
    while (groupLen > 0) {
       for (j = 0; j < groupLen; j++) {
          buffer[buffLen] = (char) idat[loc];
@@ -600,6 +604,10 @@ static int ParseSect2_Hazard (float *rdat, sInt4 nrdat, sInt4 *idat,
 
    buffLen = 0;
    buffer = (char *) malloc ((nidat + 1) * sizeof (char));
+   if (!buffer) {
+       errSprintf ("Out of memory\n");
+       return -1;
+   }
    while (groupLen > 0) {
       for (j = 0; j < groupLen; j++) {
          buffer[buffLen] = (char) idat[loc];

frmts/iso8211/8211createfromxml.cpp

@@ -262,7 +262,7 @@ int main(int nArgc, char *papszArgv[])
                     {
                         pszValue += 2;
                         int nDataLen = (int)strlen(pszValue) / 2;
-                        char *pabyData = (char *)malloc(nDataLen);
+                        char *pabyData = (char *)CPLMalloc(nDataLen);
                         for (int i = 0; i < nDataLen; i++)
                         {
                             char c;
@@ -281,7 +281,7 @@ int main(int nArgc, char *papszArgv[])
                         }
                         poRec->SetFieldRaw(poField, nFieldOcc,
                                            (const char *)pabyData, nDataLen);
-                        free(pabyData);
+                        CPLFree(pabyData);
                     }
                     else
                     {
@@ -330,7 +330,8 @@ int main(int nArgc, char *papszArgv[])
                                     pszSubfieldValue += 2;
                                     int nDataLen =
                                         (int)strlen(pszSubfieldValue) / 2;
-                                    char *pabyData = (char *)malloc(nDataLen);
+                                    char *pabyData =
+                                        (char *)CPLMalloc(nDataLen);
                                     for (int i = 0; i < nDataLen; i++)
                                     {
                                         int nHigh;
@@ -351,7 +352,7 @@ int main(int nArgc, char *papszArgv[])
                                         pszFieldName, nFieldOcc,
                                         pszSubfieldName, nOcc, pabyData,
                                         nDataLen);
-                                    free(pabyData);
+                                    CPLFree(pabyData);
                                 }
                             }
                             psSubfieldIter = psSubfieldIter->psNext;

frmts/northwood/grcdataset.cpp

@@ -241,8 +241,11 @@ NWT_GRCDataset::~NWT_GRCDataset()
     CSLDestroy(papszCategories);
 
     NWT_GRCDataset::FlushCache(true);
-    pGrd->fp = nullptr;  // this prevents nwtCloseGrid from closing the fp
-    nwtCloseGrid(pGrd);
+    if (pGrd)
+    {
+        pGrd->fp = nullptr;  // this prevents nwtCloseGrid from closing the fp
+        nwtCloseGrid(pGrd);
+    }
 
     if (fp != nullptr)
         VSIFCloseL(fp);
@@ -326,6 +329,11 @@ GDALDataset *NWT_GRCDataset::Open(GDALOpenInfo *poOpenInfo)
     VSIFSeekL(poDS->fp, 0, SEEK_SET);
     VSIFReadL(poDS->abyHeader, 1, 1024, poDS->fp);
     poDS->pGrd = static_cast<NWT_GRID *>(malloc(sizeof(NWT_GRID)));
+    if (!poDS->pGrd)
+    {
+        delete poDS;
+        return nullptr;
+    }
 
     poDS->pGrd->fp = poDS->fp;
 

frmts/northwood/grddataset.cpp

@@ -446,8 +446,11 @@ NWT_GRDDataset::~NWT_GRDDataset()
     {
         NWT_GRDDataset::FlushCache(true);
     }
-    pGrd->fp = nullptr;  // this prevents nwtCloseGrid from closing the fp
-    nwtCloseGrid(pGrd);
+    if (pGrd)
+    {
+        pGrd->fp = nullptr;  // this prevents nwtCloseGrid from closing the fp
+        nwtCloseGrid(pGrd);
+    }
     if (m_poSRS)
         m_poSRS->Release();
 
@@ -461,7 +464,7 @@ NWT_GRDDataset::~NWT_GRDDataset()
 CPLErr NWT_GRDDataset::FlushCache(bool bAtClosing)
 {
     // Ensure the header and TAB file are up to date
-    if (bUpdateHeader)
+    if (bUpdateHeader && pGrd)
     {
 #ifndef NO_MITAB_SUPPORT
         UpdateHeader();
@@ -625,6 +628,11 @@ GDALDataset *NWT_GRDDataset::Open(GDALOpenInfo *poOpenInfo)
     VSIFSeekL(poDS->fp, 0, SEEK_SET);
     VSIFReadL(poDS->abyHeader, 1, 1024, poDS->fp);
     poDS->pGrd = reinterpret_cast<NWT_GRID *>(calloc(1, sizeof(NWT_GRID)));
+    if (!poDS->pGrd)
+    {
+        delete poDS;
+        return nullptr;
+    }
 
     poDS->pGrd->fp = poDS->fp;
 
@@ -902,6 +910,11 @@ GDALDataset *NWT_GRDDataset::Create(const char *pszFilename, int nXSize,
     NWT_GRDDataset *poDS = new NWT_GRDDataset();
     poDS->eAccess = GA_Update;
     poDS->pGrd = static_cast<NWT_GRID *>(calloc(1, sizeof(NWT_GRID)));
+    if (!poDS->pGrd)
+    {
+        delete poDS;
+        return nullptr;
+    }
 
     // We currently only support GRD grid types (could potentially support GRC
     // in the papszParamList). Also only support GDT_Float32 as the data type.

frmts/northwood/northwood.cpp

@@ -171,13 +171,22 @@ int nwt_ParseHeader(NWT_GRID *pGrd, const unsigned char *nwtHeader)
         CPL_LSBPTR16(&usTmp);
         pGrd->stClassDict = reinterpret_cast<NWT_CLASSIFIED_DICT *>(
             calloc(1, sizeof(NWT_CLASSIFIED_DICT)));
+        if (!pGrd->stClassDict)
+        {
+            return FALSE;
+        }
 
         pGrd->stClassDict->nNumClassifiedItems = usTmp;
 
         pGrd->stClassDict->stClassifiedItem =
             reinterpret_cast<NWT_CLASSIFIED_ITEM **>(
                 calloc(pGrd->stClassDict->nNumClassifiedItems + 1,
                        sizeof(NWT_CLASSIFIED_ITEM *)));
+        if (!pGrd->stClassDict->stClassifiedItem)
+        {
+            pGrd->stClassDict->nNumClassifiedItems = 0;
+            return FALSE;
+        }
 
         // load the dictionary
         for (unsigned int iItem = 0;
@@ -187,6 +196,10 @@ int nwt_ParseHeader(NWT_GRID *pGrd, const unsigned char *nwtHeader)
                 pGrd->stClassDict->stClassifiedItem[iItem] =
                     reinterpret_cast<NWT_CLASSIFIED_ITEM *>(
                         calloc(1, sizeof(NWT_CLASSIFIED_ITEM)));
+            if (!psItem)
+            {
+                return FALSE;
+            }
 
             unsigned char cTmp[256];
             if (!VSIFReadL(&cTmp, 9, 1, pGrd->fp))
@@ -404,13 +417,24 @@ NWT_GRID *nwtOpenGrid(char *filename)
     }
 
     if (!VSIFReadL(nwtHeader, 1024, 1, fp))
+    {
+        VSIFCloseL(fp);
         return nullptr;
+    }
 
     if (nwtHeader[0] != 'H' || nwtHeader[1] != 'G' || nwtHeader[2] != 'P' ||
         nwtHeader[3] != 'C')
+    {
+        VSIFCloseL(fp);
         return nullptr;
+    }
 
     NWT_GRID *pGrd = reinterpret_cast<NWT_GRID *>(calloc(1, sizeof(NWT_GRID)));
+    if (!pGrd)
+    {
+        VSIFCloseL(fp);
+        return nullptr;
+    }
 
     if (nwtHeader[4] == '1')
         pGrd->cFormat = 0x00;  // grd - surface type
@@ -420,8 +444,8 @@ NWT_GRID *nwtOpenGrid(char *filename)
     {
         CPLError(CE_Failure, CPLE_NotSupported,
                  "Unhandled Northwood format type = %0xd", nwtHeader[4]);
-        if (pGrd)
-            free(pGrd);
+        VSIFCloseL(fp);
+        free(pGrd);
         return nullptr;
     }