Don't explode if we try to parse an empty keys
#16003
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
microsoft-github-policy-service
bot
added
Issue-Bug
lhecker
reviewed
Sep 19, 2023
| @@ -348,7 +348,7 @@ KeyChord ConversionTrait<KeyChord>::FromJson(const Json::Value& json) | |||
| { | |||
| throw winrt::hresult_invalid_argument{}; | |||
| } | |||
| return _fromString(til::u8u16(keyChordText)); | |||
| return keyChordText.empty() ? nullptr : _fromString(til::u8u16(keyChordText)); | |||
There was a problem hiding this comment.
I think it would be better to move this check into _fromString so that the above KeyChordSerialization::FromString method also doesn't explode.
lhecker
approved these changes
Sep 20, 2023
DHowett
approved these changes
Sep 20, 2023
DHowett
pushed a commit
that referenced
this pull request
Sep 22, 2023
Saving the SUI with an empty "keys" will persist `"keys": ""` to the JSON. The keychord parser tries to parse that. `KeyChordSerialization.cpp@_fromString` returns a KeyChord with both vkey and scancode set to 0, and the ctor asserts and explodes. We shouldn't do that. Closes #13221 (cherry picked from commit d272fc4) Service-Card-Id: 90597699 Service-Version: 1.18
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.
Saving the SUI with an empty "keys" will persist
"keys": ""to the JSON.The keychord parser tries to parse that.
KeyChordSerialization.cpp@_fromStringreturns a KeyChord with both vkey and scancode set to 0, and the ctor asserts and explodes.We shouldn't do that.
Closes #13221