Fix input buffering for A APIs #16313
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
commented
Nov 15, 2023
Comment on lines
+90
to
+93
| for (const auto& s : til::utf16_iterator{ source }) | ||
| { | ||
| char buffer[8]; | ||
| const auto length = WideCharToMultiByte(cp, 0, &wch, 1, &buffer[0], sizeof(buffer), nullptr, nullptr); | ||
| const auto length = WideCharToMultiByte(cp, 0, s.data(), gsl::narrow_cast<int>(s.size()), &buffer[0], sizeof(buffer), nullptr, nullptr); |
There was a problem hiding this comment.
I'm more confident now, Dustin (#14745 (comment)). 😄
|
Look ma! A new VS version dropped: (Image for history, since it's gone when I fix it.) |
lhecker
force-pushed
the
dev/lhecker/16223-input-buffer-fixup
branch
from
6ba2b45
to
0e9a776
Compare
|
Would you be willing to pull the audit fixes into a separate PR? |
|
Sure! #16325 |
DHowett
approved these changes
Nov 16, 2023
| // * don't store anything in `_cachedTextA` | ||
| // * leave "bc" in the `source` string, for the caller to handle | ||
| // Otherwise we'll copy "a", store "b" and return "c", which is wrong. See GH#16223. | ||
| if (target.empty()) |
There was a problem hiding this comment.
in this case, target.empty() means target is full, right? based on how bytes_transfer works, the length will be zero when there is no space remaining
There was a problem hiding this comment.
Yes, exactly. The exit condition is still !source.empty() as it was before but we now need to add target.empty() as one, as described in the comment. This results in target.empty() || !source.empty(), but the latter is already an implication of the former so we can shorten it.
zadjii-msft
approved these changes
Nov 21, 2023
lhecker
added
the
AutoMerge
microsoft-github-policy-service
bot
deleted the
dev/lhecker/16223-input-buffer-fixup
branch
DHowett
added a commit
that referenced
this pull request
Dec 4, 2023
This fixes an issue where character-wise reading of an input like "abc" would return "a" to the caller, store "b" as a partial translation (= wrong) and return "c" for the caller to store it for the next call. Closes #16223 Closes #16299 ## Validation Steps Performed * `ReadFile` with a buffer size of 1 returns inputs character by character without dropping any inputs ✅ --------- Co-authored-by: Dustin L. Howett <duhowett@microsoft.com> (cherry picked from commit 63b3820) Service-Card-Id: 91122022 Service-Version: 1.19
DHowett
added a commit
that referenced
this pull request
Jan 23, 2024
This fixes an issue where character-wise reading of an input like "abc" would return "a" to the caller, store "b" as a partial translation (= wrong) and return "c" for the caller to store it for the next call. Closes #16223 Closes #16299 ## Validation Steps Performed * `ReadFile` with a buffer size of 1 returns inputs character by character without dropping any inputs ✅ --------- Co-authored-by: Dustin L. Howett <duhowett@microsoft.com> (cherry picked from commit 63b3820) Service-Card-Id: 91108808 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.
This fixes an issue where character-wise reading of an input like "abc"
would return "a" to the caller, store "b" as a partial translation
(= wrong) and return "c" for the caller to store it for the next call.
Closes #16223
Closes #16299
Validation Steps Performed
ReadFilewith a buffer size of 1 returns inputs character bycharacter without dropping any inputs ✅