Fix memory leak

nirbar · Nov 21, 2024 · eb7ecc1 · eb7ecc1
1 parent e816d06
commit eb7ecc1
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 31 deletions.
diff --git a/src/CaCommon/WixString.h b/src/CaCommon/WixString.h
@@ -400,26 +400,6 @@ class CWixString
 		return hr;
 	}
 
-	// Remove characters from the left
-	void RemoveLeft(DWORD dwCount)
-	{
-		DWORD dwNewLen = 0;
-		DWORD i = 0;
-
-		if (dwCount >= StrLen())
-		{
-			Release();
-			return;
-		}
-
-		dwNewLen = StrLen() - dwCount;
-		for (i = 0; i < dwNewLen; ++i)
-		{
-			_pS[i] = _pS[i + dwCount];
-		}
-		_pS[i] = NULL;
-	}
-
 #pragma region Tokenize
 
 	HRESULT Tokenize(LPCWSTR delimiters, LPCWSTR* firstToken)

diff --git a/src/PanelSwCustomActions/FileEntry.cpp b/src/PanelSwCustomActions/FileEntry.cpp
@@ -136,7 +136,7 @@ CFileEntry::CFileEntry(const CFileEntry& other)
 	}
 }
 
-CFileEntry::CFileEntry(CFileEntry&& other)
+CFileEntry::CFileEntry(CFileEntry&& other) noexcept
 {
 	_szPath.Attach(other._szPath.Detach());
 	_szParentPath.Attach(other._szParentPath.Detach());
@@ -178,7 +178,7 @@ CFileEntry& CFileEntry::operator=(CFileEntry& other)
 	return *this;
 }
 
-CFileEntry& CFileEntry::operator=(CFileEntry&& other)
+CFileEntry& CFileEntry::operator=(CFileEntry&& other) noexcept
 {
 	_szPath.Attach(other._szPath.Detach());
 	_szParentPath.Attach(other._szParentPath.Detach());

diff --git a/src/PanelSwCustomActions/FileEntry.h b/src/PanelSwCustomActions/FileEntry.h
@@ -11,9 +11,9 @@ class CFileEntry
 	CFileEntry(LPCWSTR szPath);
 	CFileEntry(const WIN32_FIND_DATA& findData, LPCWSTR szBasePath);
 	CFileEntry(const CFileEntry& other);
-	CFileEntry(CFileEntry&& other);
+	CFileEntry(CFileEntry&& other) noexcept;
 	CFileEntry& operator=(CFileEntry& other);
-	CFileEntry& operator=(CFileEntry&& other);
+	CFileEntry& operator=(CFileEntry&& other) noexcept;
 
 	// Attribute tests
 	DWORD Attributes() const;

diff --git a/src/PanelSwCustomActions/FileIterator.cpp b/src/PanelSwCustomActions/FileIterator.cpp
@@ -8,11 +8,7 @@ CFileIterator::~CFileIterator()
 
 void CFileIterator::Release()
 {
-	if (_hFind != INVALID_HANDLE_VALUE)
-	{
-		::FindClose(_hFind);
-		_hFind = INVALID_HANDLE_VALUE;
-	}
+	ReleaseFileFindHandle(_hFind);
 	memset(&_findData, 0, sizeof(_findData));
 	_findData.dwFileAttributes = INVALID_FILE_ATTRIBUTES;
 	_szBasePath.Release();
@@ -55,7 +51,7 @@ CFileEntry CFileIterator::Find(LPCWSTR szBasePath, LPCWSTR szPattern, bool bRecu
 
 	// We're searching without filespec wildcard pattern so we can match subfolders
 	_hFind = ::FindFirstFile(szBasePattern, &_findData);
-	ExitOnInvalidHandleWithLastError(_hFind, _hrStatus, "Failed to find files in '%ls'");
+	ExitOnInvalidHandleWithLastError(_hFind, _hrStatus, "Failed to find files in '%ls'", szBasePath);
 
 	return ProcessFindData();
 

diff --git a/src/PanelSwCustomActions/PanelSwCustomActions.vcxproj b/src/PanelSwCustomActions/PanelSwCustomActions.vcxproj
@@ -182,6 +182,9 @@
     <ClInclude Include="$(BuildFolder)\obj\$(Configuration)\Protobuf\obfuscatedString.pb.h">
       <AutoGen>True</AutoGen>
     </ClInclude>
+    <ClInclude Include="$(BuildFolder)\obj\$(Configuration)\Protobuf\reparsePointDetails.pb.h">
+      <AutoGen>True</AutoGen>
+    </ClInclude>
     <ClInclude Include="TopShelfService.h" />
     <ClInclude Include="Unzip.h" />
     <ClInclude Include="XslTransform.h" />

diff --git a/src/PanelSwCustomActions/ReparsePoint.cpp b/src/PanelSwCustomActions/ReparsePoint.cpp
@@ -121,7 +121,7 @@ extern "C" UINT __stdcall RemoveReparseDataSched(MSIHANDLE hInstall)
 			if (longNameIdx < szFileName.StrLen())
 			{
 				CWixString szOrig(szFileName);
-				szFileName.RemoveLeft(longNameIdx + 1);
+				szFileName.Substring(longNameIdx + 1);
 				WcaLog(LOGLEVEL::LOGMSG_STANDARD, "RemoveFile/@FileName column contains a short and long file names '%ls'. Ignoring the short name and using '%ls' only", (LPCWSTR)szOrig, (LPCWSTR)szFileName);
 			}
 		}
@@ -480,6 +480,7 @@ HRESULT CReparsePoint::DeleteReparsePoint(LPCWSTR szPath, LPVOID pBuffer, DWORD
 
 LExit:
 	ReleaseFile(hFile);
+	ReleaseMem(pCurrReparseData)
 
 	return hr;
 }