PowerShell menu completion parser thread-safety fix #17221
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lhecker
reviewed
May 8, 2024
`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. Without `static` every function call will use a separate `CharReader`.
zadjii-msft
approved these changes
May 9, 2024
lhecker
approved these changes
May 9, 2024
DHowett
reviewed
May 9, 2024
| @@ -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() }; | |||
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
DHowett
pushed a commit
that referenced
this pull request
May 13, 2024
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix Terminal crashing when experimental PowerShell menu completion is very quickly invoked multiple times.
Command::ParsePowerShellMenuCompletecan be called from multiple threads, but it uses astaticJson::CharReader, which cannot safely parse data from multiple threads at the same time. Removingstaticfixes the problem, since every function call gets its ownreader.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