Fix #14630: Number separators not processed correctly #22064
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
|
I can confirm that on my local build on macOS 14.2.1, a non-breaking space ( 
Merging this would fix #14630. |
Comment on lines
+305
to
309
| std::memcpy(&sepBuffer[0], sep.data(), sep.size()); | ||
| for (int32_t j = static_cast<int32_t>(sep.size()) - 1; j >= 0; j--) | ||
| { | ||
| auto remainingLen = TSize - i; | ||
| auto cpyLen = std::min(sep.size(), remainingLen); | ||
| std::memcpy(&buffer[i], sep.data(), cpyLen); | ||
| i += static_cast<TIndex>(cpyLen); | ||
| buffer[i++] = sepBuffer[j]; | ||
| } |
There was a problem hiding this comment.
This is probably fine, but I'd feel safer if we'd just use std::reverse_copy instead.
|
I'd like to review this as well |
janisozaur
approved these changes
May 23, 2024
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.
The bug was caused because numbers are formatted in reverse order, but this did not take into account that thousands separators may consist of multiple bytes - the non-breaking space being one example. To keep things something, this reverses the byte order of the separators when copying them into the temporary buffer, so that everything is in the correct order when it gets reversed for the final time.
As a bonus, this also fixes a bug where it would truncate multibyte sequences if the buffer was almost full.
To test this, replace STR_5151 with a multibyte character, or multiple different characters and compare the results between
developand this PR.