Fix crash when terminal is reset#6777
Merged
adityapatwardhan merged 3 commits intoPowerShell:masterfrom May 8, 2018
Merged
Conversation
daxian-dbw
reviewed
Apr 30, 2018
| if (!insertMode) // then overwrite mode | ||
| if (!insertMode && s != "") // then overwrite mode | ||
| { | ||
| s = s.Remove(index, 1); |
Member
There was a problem hiding this comment.
When it's the overwrite mode, index could be out of range here too, right?
And, if we check index here, it seems no reason to keep && s != "".
daxian-dbw
reviewed
Apr 30, 2018
| s = s.Remove(index, 1); | ||
| } | ||
|
|
||
| if (index > s.Length) |
Member
There was a problem hiding this comment.
I think it would be helpful to have a comment explain when index > s.Length would happen.
daxian-dbw
reviewed
May 1, 2018
| // Modify string | ||
| if (!insertMode) // then overwrite mode | ||
| { | ||
| s = s.Remove(index, 1); |
Member
There was a problem hiding this comment.
When index == s.Length, this line will throw. The if check probably should be updated to if (!insertMode && index < s.Length)
daxian-dbw
approved these changes
May 1, 2018
anmenaga
approved these changes
May 3, 2018
adityapatwardhan
approved these changes
May 8, 2018
Closed
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
PR Summary
When terminal is reset, the state of the string buffer is wrong so the built-in readline code tries to insert a character beyond the length of the buffer and thus crashes. Fix is to check if the index is greater than the size of the buffer and set it to the end of the buffer. Validated manually.
Fix #6776
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:to the beginning of the title and remove the prefix when the PR is ready.[feature]if the change is significant or affects feature tests