ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-03 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed some handle leaks in RegDeleteTree() in some failure cases

Browse Source 
svn path=/trunk/; revision=17978
This commit is contained in:
Thomas Bluemel
2005-09-21 23:56:52 +00:00
parent 87dda98431
commit b06b7fb73a
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/lib/advapi32/reg/reg.c
+31 -20
View File
@@ -991,8 +991,7 @@ RegDeleteKeyValueA(IN HKEY hKey,
static NTSTATUS
RegpDeleteTree(IN HKEY hKey,
OUT PBOOLEAN KeysDeleted)
RegpDeleteTree(IN HKEY hKey)
{
typedef struct
{
@@ -1009,8 +1008,6 @@ RegpDeleteTree(IN HKEY hKey,
NTSTATUS Status = STATUS_SUCCESS;
NTSTATUS Status2 = STATUS_SUCCESS;
*KeysDeleted = FALSE;
InitializeListHead(&delQueueHead);
ProcessHeap = RtlGetProcessHeap();
@@ -1147,10 +1144,22 @@ SubKeyFailureNoFree:
/* NOTE: do NOT close the handle anymore, it's invalid already! */
if (!NT_SUCCESS(Status2) && NT_SUCCESS(Status))
if (!NT_SUCCESS(Status2))
{
/* don't break, let's try to delete as many keys as possible */
Status = Status2;
/* close the key handle so we don't leak handles for keys we were
unable to delete. But only do this for handles not supplied
by the caller! */
if (delKeys->KeyHandle != hKey)
{
NtClose(delKeys->KeyHandle);
}
if (!NT_SUCCESS(Status))
{
/* don't break, let's try to delete as many keys as possible */
Status = Status2;
}
}
/* remove the entry from the list */
@@ -1160,8 +1169,6 @@ SubKeyFailureNoFree:
0,
delKeys);
} while (!IsListEmpty(&delQueueHead));
*KeysDeleted = TRUE;
}
else
Status = STATUS_INSUFFICIENT_RESOURCES;
@@ -1179,7 +1186,6 @@ LONG STDCALL
RegDeleteTreeW(IN HKEY hKey,
IN LPCWSTR lpSubKey OPTIONAL)
{
BOOLEAN KeysDeleted;
HANDLE KeyHandle, CurKey, SubKeyHandle = NULL;
NTSTATUS Status;
@@ -1217,12 +1223,22 @@ RegDeleteTreeW(IN HKEY hKey,
else
CurKey = KeyHandle;
Status = RegpDeleteTree(CurKey,
&KeysDeleted);
Status = RegpDeleteTree(CurKey);
if (!KeysDeleted)
if (NT_SUCCESS(Status))
{
/* only close handles of keys that weren't deleted! */
/* make sure we only close hKey (KeyHandle) when the caller specified a
subkey, because the handle would be invalid already! */
if (CurKey != KeyHandle)
{
CloseDefaultKey(KeyHandle);
}
return ERROR_SUCCESS;
}
else
{
/* make sure we close all handles we created! */
if (SubKeyHandle != NULL)
{
NtClose(SubKeyHandle);
@@ -1230,14 +1246,9 @@ RegDeleteTreeW(IN HKEY hKey,
Cleanup:
CloseDefaultKey(KeyHandle);
}
if (!NT_SUCCESS(Status))
{
return RtlNtStatusToDosError(Status);
}
return ERROR_SUCCESS;
}