Fix memory leaks reported by static analyzer (#78492)

dotnet · Dec 13, 2022 · ea44671 · ea44671
1 parent e1300fe
commit ea44671
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 0 deletions.
diff --git a/src/coreclr/ilasm/assembler.cpp b/src/coreclr/ilasm/assembler.cpp
@@ -2737,4 +2737,9 @@ void Assembler::EmitGenericParamConstraints(int numTyPars, TyParDescr* pTyPars,
         pGPC->Token(tkOwnerOfCA);
         EmitCustomAttributes(tkOwnerOfCA, pGPC->CAList());
     }
+
+    delete[] nConstraintsArr;
+    delete[] nConstraintIndexArr;
+    delete[] pConstraintsArr;
+    delete[] pGPConstraintsArr;
 }
diff --git a/src/coreclr/pal/src/thread/process.cpp b/src/coreclr/pal/src/thread/process.cpp
@@ -3651,6 +3651,7 @@ buildArgv(
         (strcat_s(lpAsciiCmdLine, iLength, " ") != SAFECRT_SUCCESS))
     {
         ERROR("strcpy_s/strcat_s failed!\n");
+        free(lpAsciiCmdLine);
         return NULL;
     }
 

diff --git a/src/coreclr/tools/superpmi/mcs/verbconcat.cpp b/src/coreclr/tools/superpmi/mcs/verbconcat.cpp
@@ -61,18 +61,21 @@ int verbConcat::DoWork(const char* nameOfFile1, const char* nameOfFile2)
         if (res == 0)
         {
             LogError("Failed to read '%s' from offset %lld. GetLastError()=%u", nameOfFile2, offset, GetLastError());
+            delete[] buffer;
             return -1;
         }
         DWORD bytesWritten = -1;
         BOOL  res2         = WriteFile(hFileIn1, buffer, bytesRead, &bytesWritten, nullptr);
         if (res2 == 0)
         {
             LogError("Failed to write '%s' at offset %lld. GetLastError()=%u", nameOfFile1, offset, GetLastError());
+            delete[] buffer;
             return -1;
         }
         if (bytesRead != bytesWritten)
         {
             LogError("Failed to read/write matching bytes %u!=%u", bytesRead, bytesWritten);
+            delete[] buffer;
             return -1;
         }
     }

diff --git a/src/coreclr/tools/superpmi/superpmi/parallelsuperpmi.cpp b/src/coreclr/tools/superpmi/superpmi/parallelsuperpmi.cpp
@@ -395,6 +395,10 @@ static void MergeWorkerMCLs(char* mclFilename, PerWorkerData* workerData, int wo
     // Write the merged MCL array back to disk
     if (!WriteArrayToMCL(mclFilename, mergedMCL, totalCount))
         LogError("Unable to write to MCL file %s.", mclFilename);
+
+    delete[] MCL;
+    delete[] MCLCount;
+    delete[] mergedMCL;
 }
 
 static void MergeWorkerCsvs(char* csvFilename, PerWorkerData* workerData, int workerCount, char* PerWorkerData::* csvPath)