Skip to content

Allow writing of incomplete UTF-8 sequences to the Windows console via stdout/stderr #83342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 12 commits into from
Sep 2, 2021
Merged

Allow writing of incomplete UTF-8 sequences to the Windows console via stdout/stderr #83342

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
27393d5
fix incomplete UTF-8 writes in Windows console stdio
Count-Count Mar 21, 2021
a941e68
fix fmt
Count-Count Mar 21, 2021
60b149f
Export utf8_char_width() publicly in core::std behind the "str_intern…
Count-Count Mar 21, 2021
0202273
fix c&p error
Count-Count Mar 21, 2021
d114694
Reject byte if it cannot start a valid UTF-8 sequence.
Count-Count Mar 24, 2021
52713a4
fix
Count-Count Mar 24, 2021
fb1fa97
use io::Error::new_const() everywhere
Count-Count Mar 24, 2021
34cfe38
correct comment
Count-Count Mar 24, 2021
3103f5f
rename fn write_valid_utf8() to write_valid_utf8_to_console()
Count-Count Mar 24, 2021
7cfbe54
assert!() instead of panic!() for expected invariant
Count-Count Mar 24, 2021
dd3b79e
comment pos
Count-Count Mar 24, 2021
fbfde7e
Style only: merge with other pub use statement
Count-Count Apr 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Reject byte if it cannot start a valid UTF-8 sequence.
  • Loading branch information
@Count-Count
Count-Count committed Mar 24, 2021
commit d11469404274c7162b295105846f98111bc273ab
3 changes: 2 additions & 1 deletion library/std/src/sys/windows/stdio.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,8 @@ fn write(
let utf8 = match str::from_utf8(&data[..len]) {
Ok(s) => s,
Err(ref e) if e.valid_up_to() == 0 => {
if data.len() < utf8_char_width(data[0]) {
first_byte_char_width = utf8_char_width(data[0]);
if first_byte_char_width > 1 && data.len() < first_byte_char_width {
incomplete_utf8.bytes[0] = data[0];
incomplete_utf8.len = 1;
return Ok(1);
Expand Down