mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-03-18 01:20:54 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Command Resource Exhaustion bug fix (#1531)

Browse Source 
Co-authored-by: kirksaunders <kirksaunders12@gmail.com>
This commit is contained in:
Chase Payne 2023-08-14 18:50:23 -05:00 committed by GitHub
parent def9b2d76f
commit 980e396c4f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/platform/windows/misc.cpp
View File

@ -560,6 +560,11 @@ namespace platf {
STARTUPINFOEXW startup_info = create_startup_info(file, ec); STARTUPINFOEXW startup_info = create_startup_info(file, ec);
PROCESS_INFORMATION process_info; PROCESS_INFORMATION process_info;
// Clone the environment to create a local copy. Boost.Process (bp) shares the environment with all spawned processes.
// Since we're going to modify the 'env' variable by merging user-specific environment variables into it,
// we make a clone to prevent side effects to the shared environment.
bp::environment cloned_env = env;
if (ec) { if (ec) {
// In the event that startup_info failed, return a blank child process. // In the event that startup_info failed, return a blank child process.
return bp::child(); return bp::child();
@ -590,14 +595,14 @@ namespace platf {
}); });
// Populate env with user-specific environment variables // Populate env with user-specific environment variables
if (!merge_user_environment_block(env, user_token)) { if (!merge_user_environment_block(cloned_env, user_token)) {
ec = std::make_error_code(std::errc::not_enough_memory); ec = std::make_error_code(std::errc::not_enough_memory);
return bp::child(); return bp::child();
} }
// Open the process as the current user account, elevation is handled in the token itself. // Open the process as the current user account, elevation is handled in the token itself.
ec = impersonate_current_user(user_token, [&]() { ec = impersonate_current_user(user_token, [&]() {
std::wstring env_block = create_environment_block(env); std::wstring env_block = create_environment_block(cloned_env);
ret = CreateProcessAsUserW(user_token, ret = CreateProcessAsUserW(user_token,
NULL, NULL,
(LPWSTR) wcmd.c_str(), (LPWSTR) wcmd.c_str(),
@ -625,12 +630,12 @@ namespace platf {
}); });
// Populate env with user-specific environment variables // Populate env with user-specific environment variables
if (!merge_user_environment_block(env, process_token)) { if (!merge_user_environment_block(cloned_env, process_token)) {
ec = std::make_error_code(std::errc::not_enough_memory); ec = std::make_error_code(std::errc::not_enough_memory);
return bp::child(); return bp::child();
} }
std::wstring env_block = create_environment_block(env); std::wstring env_block = create_environment_block(cloned_env);
ret = CreateProcessW(NULL, ret = CreateProcessW(NULL,
(LPWSTR) wcmd.c_str(), (LPWSTR) wcmd.c_str(),
NULL, NULL,