reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-11-23 19:49:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ENH: fix resource leak

Browse Source
This commit is contained in:
Bill Hoffman 2007-07-24 10:05:31 -04:00
parent 8a6e2bb81d
commit 4ae802d9c1
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/kwsys/ProcessWin32.c
View File

@ -1453,7 +1453,6 @@ int kwsysProcess_WaitForExit(kwsysProcess* cp, double* userTimeout)
void kwsysProcess_Kill(kwsysProcess* cp) void kwsysProcess_Kill(kwsysProcess* cp)
{ {
int i; int i;
/* Make sure we are executing a process. */ /* Make sure we are executing a process. */
if(!cp || cp->State != kwsysProcess_State_Executing || cp->TimeoutExpired || if(!cp || cp->State != kwsysProcess_State_Executing || cp->TimeoutExpired ||
cp->Killed) cp->Killed)
@ -1485,7 +1484,10 @@ void kwsysProcess_Kill(kwsysProcess* cp)
/* Not Windows 9x. Just terminate the children. */ /* Not Windows 9x. Just terminate the children. */
for(i=0; i < cp->NumberOfCommands; ++i) for(i=0; i < cp->NumberOfCommands; ++i)
{ {
kwsysProcessKillTree(cp->ProcessInformation[i].dwProcessId); kwsysProcessKillTree(cp->ProcessInformation[i].dwProcessId);
// close the handle if we kill it
kwsysProcessCleanupHandle(&cp->ProcessInformation[i].hThread);
kwsysProcessCleanupHandle(&cp->ProcessInformation[i].hProcess);
} }
} }
@ -1851,7 +1853,6 @@ int kwsysProcessCreate(kwsysProcess* cp, int index,
r = CreateProcess(0, realCommand, 0, 0, TRUE, r = CreateProcess(0, realCommand, 0, 0, TRUE,
cp->Win9x? 0 : CREATE_SUSPENDED, 0, 0, cp->Win9x? 0 : CREATE_SUSPENDED, 0, 0,
&si->StartupInfo, &cp->ProcessInformation[index]); &si->StartupInfo, &cp->ProcessInformation[index]);
if(cp->Win9x) if(cp->Win9x)
{ {
/* Free memory. */ /* Free memory. */
@ -2114,7 +2115,6 @@ void kwsysProcessCleanupHandleSafe(PHANDLE h, DWORD nStdHandle)
void kwsysProcessCleanup(kwsysProcess* cp, int error) void kwsysProcessCleanup(kwsysProcess* cp, int error)
{ {
int i; int i;
/* If this is an error case, report the error. */ /* If this is an error case, report the error. */
if(error) if(error)
{ {
@ -2861,6 +2861,7 @@ static void kwsysProcessKill(DWORD pid)
{ {
TerminateProcess(h, 255); TerminateProcess(h, 255);
WaitForSingleObject(h, INFINITE); WaitForSingleObject(h, INFINITE);
CloseHandle(h);
} }
} }