ApfelTeeSaft/reactos
1
0
Fork 0
mirror of https://github.com/ApfelTeeSaft/reactos.git synced 2026-09-01 19:26:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

[TASKMGR]

Browse Source 
Don't leak process handle

CORE-3716

svn path=/trunk/; revision=65625
This commit is contained in:
Pierre Schweitzer
2014-12-13 08:18:09 +00:00
parent e3228a4c64
commit 065dd42b53
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
reactos/base/applications/taskmgr/endproc.c
+11 -3
View File
@@ -46,6 +46,7 @@ void ProcessPage_OnEndProcess(void)
LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256);
LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256);
MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST);
CloseHandle(hProcess);
return;
}
@@ -53,7 +54,10 @@ void ProcessPage_OnEndProcess(void)
LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256);
LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256);
if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING|MB_TOPMOST) != IDYES)
{
if (hProcess) CloseHandle(hProcess);
return;
}
/* no such process or not enough privileges to open its token */
if (!hProcess)
@@ -82,7 +86,7 @@ BOOL IsCriticalProcess(HANDLE hProcess)
/* return early if the process handle does not exist */
if (!hProcess)
return FALSE;
return FALSE;
/* the important system processes that we don't want to let the user
kill come marked as critical, this simplifies the check greatly.
@@ -97,8 +101,8 @@ BOOL IsCriticalProcess(HANDLE hProcess)
NULL);
if (NT_SUCCESS(status) && BreakOnTermination)
return TRUE;
return TRUE;
return FALSE;
}
@@ -122,13 +126,17 @@ void ProcessPage_OnEndProcessTree(void)
LoadStringW(hInst, IDS_MSG_UNABLETERMINATEPRO, szTitle, 256);
LoadStringW(hInst, IDS_MSG_CLOSESYSTEMPROCESS, strErrorText, 256);
MessageBoxW(hMainWnd, strErrorText, szTitle, MB_OK|MB_ICONWARNING|MB_TOPMOST);
CloseHandle(hProcess);
return;
}
LoadStringW(hInst, IDS_MSG_WARNINGTERMINATING, strErrorText, 256);
LoadStringW(hInst, IDS_MSG_TASKMGRWARNING, szTitle, 256);
if (MessageBoxW(hMainWnd, strErrorText, szTitle, MB_YESNO|MB_ICONWARNING) != IDYES)
{
if (hProcess) CloseHandle(hProcess);
return;
}
if (!hProcess)
{