lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-13 05:20:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Always close pipes opened for subprocess communication. Closes #1424

Browse Source 
* We still need to close the stdout/stderr pipes even if the subprocess failed
  to launch, otherwise we leak the fds.
This commit is contained in:
baldurk
2019-06-24 13:52:42 +01:00
parent 51de7255d3
commit 433222997f
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/os/posix/posix_process.cpp
+17 -14
View File
@@ -654,27 +654,30 @@ uint32_t Process::LaunchProcess(const char *app, const char *workingDir, const c
uint32_t ret = (uint32_t)RunProcess(app, workingDir, cmdLine, currentEnvironment,
result ? stdoutPipe : NULL, result ? stderrPipe : NULL);
if(ret && result)
if(result)
{
result->strStdout = "";
result->strStderror = "";
ssize_t stdoutRead, stderrRead;
char chBuf[4096];
do
if(ret)
{
stdoutRead = read(stdoutPipe[0], chBuf, sizeof(chBuf));
if(stdoutRead > 0)
result->strStdout += std::string(chBuf, stdoutRead);
} while(stdoutRead > 0);
ssize_t stdoutRead, stderrRead;
char chBuf[4096];
do
{
stdoutRead = read(stdoutPipe[0], chBuf, sizeof(chBuf));
if(stdoutRead > 0)
result->strStdout += std::string(chBuf, stdoutRead);
} while(stdoutRead > 0);
do
{
stderrRead = read(stderrPipe[0], chBuf, sizeof(chBuf));
if(stderrRead > 0)
result->strStderror += std::string(chBuf, stderrRead);
do
{
stderrRead = read(stderrPipe[0], chBuf, sizeof(chBuf));
if(stderrRead > 0)
result->strStderror += std::string(chBuf, stderrRead);
} while(stderrRead > 0);
} while(stderrRead > 0);
}
// Close read ends.
close(stdoutPipe[0]);