Skip to content

Commit

Permalink
PowerShell menu completion parser thread-safety fix (#17221)
Browse files Browse the repository at this point in the history
Fix Terminal crashing when experimental PowerShell menu completion is
very quickly invoked multiple times.

`Command::ParsePowerShellMenuComplete` can be called from multiple
threads, but it uses a `static` `Json::CharReader`, which cannot safely
parse data from multiple threads at the same time. Removing `static`
fixes the problem, since every function call gets its own `reader`.

Validation: Pressed Ctrl+Space quickly a few times with hardcoded huge
JSON as the completion payload. Also shown at the end of the second
video in #17220.

Closes #17220

(cherry picked from commit 44516ad)
Service-Card-Id: 92524217
Service-Version: 1.21
  • Loading branch information
krzysdz authored and DHowett committed May 13, 2024
1 parent 4d1b543 commit 18c3f72
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/cascadia/TerminalSettingsModel/Command.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@ namespace winrt::Microsoft::Terminal::Settings::Model::implementation
auto data = winrt::to_string(json);

std::string errs;
static std::unique_ptr<Json::CharReader> reader{ Json::CharReaderBuilder{}.newCharReader() };
std::unique_ptr<Json::CharReader> reader{ Json::CharReaderBuilder{}.newCharReader() };
Json::Value root;
if (!reader->parse(data.data(), data.data() + data.size(), &root, &errs))
{
Expand Down

0 comments on commit 18c3f72

Please sign in to comment.