tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Comment out InitializeProcThreadAttributeList (for now) 

fixes #7681
This commit is contained in:
Gunnar Beutner 2014-11-17 09:45:35 +01:00
parent 9386a58bf2
commit 1d16875b95
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
lib/base/process.cpp
View File

@ -319,7 +319,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
<< boost::errinfo_api_function("DuplicateHandle") << boost::errinfo_api_function("DuplicateHandle")
<< errinfo_win32_error(GetLastError())); << errinfo_win32_error(GetLastError()));
LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList; /* LPPROC_THREAD_ATTRIBUTE_LIST lpAttributeList;
SIZE_T cbSize; SIZE_T cbSize;
if (!InitializeProcThreadAttributeList(NULL, 1, 0, &cbSize) && GetLastError() != ERROR_INSUFFICIENT_BUFFER) if (!InitializeProcThreadAttributeList(NULL, 1, 0, &cbSize) && GetLastError() != ERROR_INSUFFICIENT_BUFFER)
@ -344,6 +344,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
BOOST_THROW_EXCEPTION(win32_error() BOOST_THROW_EXCEPTION(win32_error()
<< boost::errinfo_api_function("UpdateProcThreadAttribute") << boost::errinfo_api_function("UpdateProcThreadAttribute")
<< errinfo_win32_error(GetLastError())); << errinfo_win32_error(GetLastError()));
*/
STARTUPINFOEX si = {}; STARTUPINFOEX si = {};
si.StartupInfo.cb = sizeof(si); si.StartupInfo.cb = sizeof(si);
@ -351,7 +352,7 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
si.StartupInfo.hStdOutput = outWritePipeDup; si.StartupInfo.hStdOutput = outWritePipeDup;
si.StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE); si.StartupInfo.hStdInput = GetStdHandle(STD_INPUT_HANDLE);
si.StartupInfo.dwFlags = STARTF_USESTDHANDLES; si.StartupInfo.dwFlags = STARTF_USESTDHANDLES;
si.lpAttributeList = lpAttributeList; // si.lpAttributeList = lpAttributeList;
PROCESS_INFORMATION pi; PROCESS_INFORMATION pi;
@ -412,13 +413,13 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
envp[offset] = '\0'; envp[offset] = '\0';
if (!CreateProcess(NULL, args, NULL, NULL, TRUE, if (!CreateProcess(NULL, args, NULL, NULL, TRUE,
EXTENDED_STARTUPINFO_PRESENT, envp, NULL, &si.StartupInfo, &pi)) { 0 /*EXTENDED_STARTUPINFO_PRESENT*/, envp, NULL, &si.StartupInfo, &pi)) {
DWORD error = GetLastError(); DWORD error = GetLastError();
CloseHandle(outWritePipe); CloseHandle(outWritePipe);
CloseHandle(outWritePipeDup); CloseHandle(outWritePipeDup);
free(envp); free(envp);
DeleteProcThreadAttributeList(lpAttributeList); /* DeleteProcThreadAttributeList(lpAttributeList);
delete [] reinterpret_cast<char *>(lpAttributeList); delete [] reinterpret_cast<char *>(lpAttributeList); */
m_Result.PID = 0; m_Result.PID = 0;
m_Result.ExecutionEnd = Utility::GetTime(); m_Result.ExecutionEnd = Utility::GetTime();
@ -435,8 +436,8 @@ void Process::Run(const boost::function<void(const ProcessResult&)>& callback)
delete [] args; delete [] args;
free(envp); free(envp);
DeleteProcThreadAttributeList(lpAttributeList); /* DeleteProcThreadAttributeList(lpAttributeList);
delete [] reinterpret_cast<char *>(lpAttributeList); delete [] reinterpret_cast<char *>(lpAttributeList); */
CloseHandle(outWritePipe); CloseHandle(outWritePipe);
CloseHandle(outWritePipeDup); CloseHandle(outWritePipeDup);