Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-12-16 11:48:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

interop: fix issues in IPC message construction (#9035)

Browse Source 
* interop: fix issues in IPC message construction

- simplify logic
- handle exceptions to prevent crashes
- log errors

* Update src/runner/settings_window.cpp

Co-authored-by: Enrico Giordani <enricogior@users.noreply.github.com>

* Update src/runner/settings_window.cpp

Co-authored-by: Enrico Giordani <enricogior@users.noreply.github.com>

* fixup

* comments + fix build

Co-authored-by: Enrico Giordani <enricogior@users.noreply.github.com>
This commit is contained in:
Andrey Nekrasov
2021-01-12 20:42:16 +03:00
committed by GitHub
parent 1364f78b30
commit 7a562950b0
3 changed files with 36 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runner/settings_window.cpp
View File

@@ -41,7 +41,7 @@ json::JsonObject get_power_toys_settings()
}
catch (...)
{
// TODO: handle malformed JSON.
Logger::error("get_power_toys_settings: got malformed json");
}
}
return result;
@@ -154,7 +154,14 @@ void dispatch_json_config_to_modules(const json::JsonObject& powertoys_configs)
void dispatch_received_json(const std::wstring& json_to_parse)
{
const json::JsonObject j = json::JsonObject::Parse(json_to_parse);
json::JsonObject j;
const bool ok = json::JsonObject::TryParse(json_to_parse, j);
if (!ok)
{
Logger::error(L"dispatch_received_json: got malformed json: {}", json_to_parse);
return;
}
for (const auto& base_element : j)
{
if (!current_settings_ipc)