mir/PowerToys
2
0
Fork 0
mirror of https://github.com/microsoft/PowerToys synced 2025-08-29 13:37:43 +00:00
Code Issues Actions 18 Packages Projects Releases Wiki Activity

[Runner]Fix concurrency crashes when accessing ipc (#22227)

Browse Source
This commit is contained in:
Jaime Bernardo 2022-11-22 16:58:49 +00:00 committed by GitHub
parent ef8415ddfe
commit d931937538
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/runner/settings_window.cpp
View File

@ -28,6 +28,7 @@
#define BUFSIZE 1024 #define BUFSIZE 1024
TwoWayPipeMessageIPC* current_settings_ipc = NULL; TwoWayPipeMessageIPC* current_settings_ipc = NULL;
std::mutex ipc_mutex;
std::atomic_bool g_isLaunchInProgress = false; std::atomic_bool g_isLaunchInProgress = false;
json::JsonObject get_power_toys_settings() json::JsonObject get_power_toys_settings()
@ -165,11 +166,6 @@ void dispatch_received_json(const std::wstring& json_to_parse)
for (const auto& base_element : j) for (const auto& base_element : j)
{ {
if (!current_settings_ipc)
{
continue;
}
const auto name = base_element.Key(); const auto name = base_element.Key();
const auto value = base_element.Value(); const auto value = base_element.Value();
@ -177,25 +173,41 @@ void dispatch_received_json(const std::wstring& json_to_parse)
{ {
apply_general_settings(value.GetObjectW()); apply_general_settings(value.GetObjectW());
const std::wstring settings_string{ get_all_settings().Stringify().c_str() }; const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string); {
std::unique_lock lock{ ipc_mutex };
if(current_settings_ipc)
current_settings_ipc->send(settings_string);
}
} }
else if (name == L"powertoys") else if (name == L"powertoys")
{ {
dispatch_json_config_to_modules(value.GetObjectW()); dispatch_json_config_to_modules(value.GetObjectW());
const std::wstring settings_string{ get_all_settings().Stringify().c_str() }; const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string); {
std::unique_lock lock{ ipc_mutex };
if(current_settings_ipc)
current_settings_ipc->send(settings_string);
}
} }
else if (name == L"refresh") else if (name == L"refresh")
{ {
const std::wstring settings_string{ get_all_settings().Stringify().c_str() }; const std::wstring settings_string{ get_all_settings().Stringify().c_str() };
current_settings_ipc->send(settings_string); {
std::unique_lock lock{ ipc_mutex };
if(current_settings_ipc)
current_settings_ipc->send(settings_string);
}
} }
else if (name == L"action") else if (name == L"action")
{ {
auto result = dispatch_json_action_to_module(value.GetObjectW()); auto result = dispatch_json_action_to_module(value.GetObjectW());
if (result.has_value()) if (result.has_value())
{ {
current_settings_ipc->send(result.value()); {
std::unique_lock lock{ ipc_mutex };
if(current_settings_ipc)
current_settings_ipc->send(result.value());
}
} }
} }
} }
@ -414,8 +426,11 @@ void run_settings_window(bool show_oobe_window, bool show_scoobe_window, std::op
goto LExit; goto LExit;
} }
current_settings_ipc = new TwoWayPipeMessageIPC(powertoys_pipe_name, settings_pipe_name, receive_json_send_to_main_thread); {
current_settings_ipc->start(hToken); std::unique_lock lock{ ipc_mutex };
current_settings_ipc = new TwoWayPipeMessageIPC(powertoys_pipe_name, settings_pipe_name, receive_json_send_to_main_thread);
current_settings_ipc->start(hToken);
}
g_settings_process_id = process_info.dwProcessId; g_settings_process_id = process_info.dwProcessId;
if (process_info.hProcess) if (process_info.hProcess)
@ -443,12 +458,14 @@ LExit:
{ {
CloseHandle(process_info.hThread); CloseHandle(process_info.hThread);
} }
if (current_settings_ipc)
{ {
current_settings_ipc->end(); std::unique_lock lock{ ipc_mutex };
delete current_settings_ipc; if (current_settings_ipc)
current_settings_ipc = nullptr; {
current_settings_ipc->end();
delete current_settings_ipc;
current_settings_ipc = nullptr;
}
} }
if (hToken) if (hToken)