8000 gh-110913: Fix WindowsConsoleIO chunking of UTF-8 text by sorgloomer · Pull Request #111007 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

gh-110913: Fix WindowsConsoleIO chunking of UTF-8 text #111007

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
merged 4 commits into from
Oct 20, 2023
Merged

gh-110913: Fix WindowsConsoleIO chunking of UTF-8 text #111007

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b0bf5b
Fix UTF-8 sequence boundary search
sorgloomer Oct 17, 2023
fae5147
📜🤖 Added by blurb_it.
blurb-it[bot] Oct 19, 2023
cd641bf
Style fix.
serhiy-storchaka Oct 19, 2023
0c8ca33
Period.
serhiy-storchaka Oct 19, 2023
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
Next Next commit
Fix UTF-8 sequence boundary search
  • Loading branch information
@sorgloomer
sorgloomer committed Oct 18, 2023
commit 2b0bf5bd7b93d480a1c2634059101a6265913f81
31 changes: 15 additions & 16 deletions Modules/_io/winconsoleio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,18 @@ char _PyIO_get_console_type(PyObject *path_or_fd) {
return m;
}

DWORD _find_last_utf8_boundary(char *buf, DWORD len) {
/* This function never returns 0, returns the original len instead */
DWORD count = 1;
if (len == 0 || (buf[len - 1] & 0x80) == 0)
return len;
for (;; count++) {
if (count > 3 || count >= len)
return len;
if ((buf[len - count] & 0xc0) != 0x80)
return len - count;
}
}

/*[clinic input]
module _io
Expand Down Expand Up @@ -975,7 +987,7 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, PyTypeObject *cls,
{
BOOL res = TRUE;
wchar_t *wbuf;
DWORD len, wlen, orig_len, n = 0;
DWORD len, wlen, n = 0;
HANDLE handle;

if (self->fd == -1)
Expand Down Expand Up @@ -1007,21 +1019,8 @@ _io__WindowsConsoleIO_write_impl(winconsoleio *self, PyTypeObject *cls,
have to reduce and recalculate. */
while (wlen > 32766 / sizeof(wchar_t)) {
len /= 2;
orig_len = len;
/* Reduce the length until we hit the final byte of a UTF-8 sequence
* (top bit is unset). Fix for github issue 82052.
*/
while (len > 0 && (((char *)b->buf)[len-1] & 0x80) != 0)
--len;
/* If we hit a length of 0, something has gone wrong. This shouldn't
* be possible, as valid UTF-8 can have at most 3 non-final bytes
* before a final one, and our buffer is way longer than that.
* But to be on the safe side, if we hit this issue we just restore
* the original length and let the console API sort it out.
*/
if (len == 0) {
len = orig_len;
}
/* Fix for github issues gh-110913 and gh-82052. */
len = _find_last_utf8_boundary(b->buf, len);
wlen = MultiByteToWideChar(CP_UTF8, 0, b->buf, len, NULL, 0);
}
Py_END_ALLOW_THREADS
Expand Down
0