kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ENH: fix resource leak

This commit is contained in:
Bill Hoffman 2007-07-24 15:55:03 -04:00
parent f89dac80fd
commit 69b7ba3543
1 changed files with 44 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Source/cmWin32ProcessExecution.cxx
View File

@ -142,14 +142,11 @@ bool cmWin32ProcessExecution::BorlandRunCommand(
if (!CreatePipe(&newstdin,&write_stdin,&sa,0)) if (!CreatePipe(&newstdin,&write_stdin,&sa,0))
//create stdin pipe //create stdin pipe
{ {
std::cerr << "CreatePipe" << std::endl;
return false; return false;
} }
if (!CreatePipe(&read_stdout,&newstdout,&sa,0)) if (!CreatePipe(&read_stdout,&newstdout,&sa,0))
//create stdout pipe //create stdout pipe
{ {
std::cerr << "CreatePipe" << std::endl;
CloseHandle(newstdin); CloseHandle(newstdin);
CloseHandle(write_stdin); CloseHandle(write_stdin);
return false; return false;
@ -637,8 +634,22 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
this->hChildStdoutWr, this->hChildStdoutWr,
&hProcess, this->HideWindows, &hProcess, this->HideWindows,
this->Output)) this->Output))
{
if(fd1 >= 0)
{
close(fd1);
}
if(fd2 >= 0)
{
close(fd2);
}
if(fd3 >= 0)
{
close(fd3);
}
return 0; return 0;
} }
}
else else
{ {
if (!RealPopenCreateProcess(cmdstring, if (!RealPopenCreateProcess(cmdstring,
@ -649,8 +660,22 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
this->hChildStderrWr, this->hChildStderrWr,
&hProcess, this->HideWindows, &hProcess, this->HideWindows,
this->Output)) this->Output))
{
if(fd1 >= 0)
{
close(fd1);
}
if(fd2 >= 0)
{
close(fd2);
}
if(fd3 >= 0)
{
close(fd3);
}
return 0; return 0;
} }
}
/* /*
* Insert the files we've created into the process dictionary * Insert the files we've created into the process dictionary
@ -672,17 +697,14 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
this->ProcessHandle = hProcess; this->ProcessHandle = hProcess;
if ( fd1 >= 0 ) if ( fd1 >= 0 )
{ {
// this->StdIn = f1;
this->pStdIn = fd1; this->pStdIn = fd1;
} }
if ( fd2 >= 0 ) if ( fd2 >= 0 )
{ {
// this->StdOut = f2;
this->pStdOut = fd2; this->pStdOut = fd2;
} }
if ( fd3 >= 0 ) if ( fd3 >= 0 )
{ {
// this->StdErr = f3;
this->pStdErr = fd3; this->pStdErr = fd3;
} }
@ -691,6 +713,22 @@ bool cmWin32ProcessExecution::PrivateOpen(const char *cmdstring,
bool cmWin32ProcessExecution::CloseHandles() bool cmWin32ProcessExecution::CloseHandles()
{ {
if(this->pStdErr != -1 )
{
_close(this->pStdErr);
this->pStdErr = -1;
}
if(this->pStdIn != -1 )
{
_close(this->pStdIn);
this->pStdIn = -1;
}
if(this->pStdOut != -1 )
{
_close(this->pStdOut);
this->pStdOut = -1;
}
bool ret = true; bool ret = true;
if (this->hChildStdinRd && !CloseHandle(this->hChildStdinRd)) if (this->hChildStdinRd && !CloseHandle(this->hChildStdinRd))
{ {