Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-05-31 09:41:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

[REGEDIT] ModifyValue(): Always HeapFree() + '= NULL' on static vars

Browse source 
Use a consistent and clear/safe pattern.
This commit is contained in:
Serge Gautherie 2020-06-14 13:49:22 +02:00
parent e6cb6d257a
commit c87402c199
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
base/applications/regedit/edit.c
View file

@ -1670,8 +1670,6 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
lRet = ERROR_SUCCESS; /* Allow editing of (Default) values which don't exist */
type = REG_SZ;
valueDataLen = 0;
stringValueData = NULL;
binValueData = NULL;
}
if (lRet != ERROR_SUCCESS)
@ -1937,6 +1935,7 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
if (lRet != ERROR_SUCCESS)
{
HeapFree(GetProcessHeap(), 0, binValueData);
binValueData = NULL;
error(hwnd, IDS_BAD_VALUE, valueName);
goto done;
}
@ -1954,8 +1953,12 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
if (lRet == ERROR_SUCCESS)
result = TRUE;
}
if(binValueData != NULL)
if (binValueData)
{
HeapFree(GetProcessHeap(), 0, binValueData);
binValueData = NULL;
}
}
else
{
@ -1964,16 +1967,22 @@ BOOL ModifyValue(HWND hwnd, HKEY hKey, LPCWSTR valueName, BOOL EditBin)
done:
if (resourceValueData)
{
HeapFree(GetProcessHeap(), 0, resourceValueData);
resourceValueData = NULL;
resourceValueData = NULL;
}
if (stringValueData)
{
HeapFree(GetProcessHeap(), 0, stringValueData);
stringValueData = NULL;
stringValueData = NULL;
}
if (requirementsValueData)
{
HeapFree(GetProcessHeap(), 0, requirementsValueData);
requirementsValueData = NULL;
requirementsValueData = NULL;
}
return result;
}