ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix create process with executable with space in path

Browse Source
This commit is contained in:
Benau 2019-12-28 12:42:40 +08:00
parent 27fce1d1a4
commit 10c0515c88
2 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/states_screens/online/create_server_screen.cpp
View File

@ -332,9 +332,6 @@ void CreateServerScreen::createServer()
NetworkConfig::get()->setIsServer(false); NetworkConfig::get()->setIsServer(false);
std::ostringstream server_cfg; std::ostringstream server_cfg;
#ifdef WIN32
server_cfg << " ";
#endif
const std::string server_name = StringUtils::xmlEncode(name); const std::string server_name = StringUtils::xmlEncode(name);
if (NetworkConfig::get()->isWAN()) if (NetworkConfig::get()->isWAN())

25
src/utils/separate_process.cpp
View File

@ -189,6 +189,7 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
bool create_pipe, bool create_pipe,
const std::string& childprocess_name) const std::string& childprocess_name)
{ {
int error = 0;
// Based on: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682499(v=vs.85).aspx // Based on: https://msdn.microsoft.com/en-us/library/windows/desktop/ms682499(v=vs.85).aspx
SECURITY_ATTRIBUTES sec_attr; SECURITY_ATTRIBUTES sec_attr;
@ -202,28 +203,36 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
{ {
if (!CreatePipe(&m_child_stdout_read, &m_child_stdout_write, &sec_attr, 0)) if (!CreatePipe(&m_child_stdout_read, &m_child_stdout_write, &sec_attr, 0))
{ {
Log::error("SeparateProcess", "Error creating StdoutRd CreatePipe"); error = GetLastError();
Log::error("SeparateProcess", "StdoutRd CreatePipe error code: %d",
error);
return false; return false;
} }
// Ensure the read handle to the pipe for STDOUT is not inherited. // Ensure the read handle to the pipe for STDOUT is not inherited.
if (!SetHandleInformation(m_child_stdout_read, HANDLE_FLAG_INHERIT, 0)) if (!SetHandleInformation(m_child_stdout_read, HANDLE_FLAG_INHERIT, 0))
{ {
Log::error("SeparateProcess", "Stdout SetHandleInformation"); error = GetLastError();
Log::error("SeparateProcess",
"Stdout SetHandleInformation error code: %d", error);
return false; return false;
} }
// Create a pipe for the child process's STDIN. // Create a pipe for the child process's STDIN.
if (!CreatePipe(&m_child_stdin_read, &m_child_stdin_write, &sec_attr, 0)) if (!CreatePipe(&m_child_stdin_read, &m_child_stdin_write, &sec_attr, 0))
{ {
Log::error("SeparateProcess", "Stdin CreatePipe"); error = GetLastError();
Log::error("SeparateProcess", "Stdin CreatePipe error code: %d",
error);
return false; return false;
} }
// Ensure the write handle to the pipe for STDIN is not inherited. // Ensure the write handle to the pipe for STDIN is not inherited.
if (!SetHandleInformation(m_child_stdin_write, HANDLE_FLAG_INHERIT, 0)) if (!SetHandleInformation(m_child_stdin_write, HANDLE_FLAG_INHERIT, 0))
{ {
Log::error("SeparateProcess", "Stdin SetHandleInformation"); error = GetLastError();
Log::error("SeparateProcess",
"Stdin SetHandleInformation error code: %d", error);
return false; return false;
} }
} }
@ -248,10 +257,12 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
} }
// Create the child process. // Create the child process.
std::string cmd = exe + argument + " --parent-process=" + std::string cmd = " "; // Required for 1st argument
cmd += argument + " --parent-process=" +
StringUtils::toString(GetCurrentProcessId()); StringUtils::toString(GetCurrentProcessId());
core::stringw exe_w = StringUtils::utf8ToWide(exe);
core::stringw cmd_w = StringUtils::utf8ToWide(cmd); core::stringw cmd_w = StringUtils::utf8ToWide(cmd);
bool success = CreateProcess(NULL, bool success = CreateProcess(exe_w.data(), // application name
cmd_w.data(), // command line cmd_w.data(), // command line
NULL, // process security attributes NULL, // process security attributes
NULL, // primary thread security attributes NULL, // primary thread security attributes
@ -264,6 +275,8 @@ bool SeparateProcess::createChildProcess(const std::string& exe,
if (!success) if (!success)
{ {
error = GetLastError();
Log::error("SeparateProcess", "CreateProcess error code: %d", error);
return false; return false;
} }