Skip to content

gh-155742: Use PyBytesWriter in winconsoleio.c #157391

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
vstinner merged 1 commit into from
Sep 13, 2026
+7 −14
Merged

gh-155742: Use PyBytesWriter in winconsoleio.c #157391

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 7 additions & 14 deletions Modules/_io/winconsoleio.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1009,7 +1009,6 @@ _io__WindowsConsoleIO_read_impl(winconsoleio *self, PyTypeObject *cls,
Py_ssize_t size)
/*[clinic end generated code: output=7e569a586537c0ae input=a14570a5da273365]*/
{
PyObject *bytes;
Py_ssize_t bytes_size;

if (self->fd == -1)
Expand All @@ -1026,26 +1025,20 @@ _io__WindowsConsoleIO_read_impl(winconsoleio *self, PyTypeObject *cls,
return NULL;
}

bytes = PyBytes_FromStringAndSize(NULL, size);
if (bytes == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(size);
if (writer == NULL) {
return NULL;
}

_PyIO_State *state = get_io_state_by_cls(cls);
bytes_size = readinto(state, self, PyBytes_AS_STRING(bytes),
PyBytes_GET_SIZE(bytes));
bytes_size = readinto(state, self, PyBytesWriter_GetData(writer),
PyBytesWriter_GetSize(writer));
if (bytes_size < 0) {
Py_CLEAR(bytes);
PyBytesWriter_Discard(writer);
return NULL;
}

if (bytes_size < PyBytes_GET_SIZE(bytes)) {
if (_PyBytes_Resize(&bytes, bytes_size) < 0) {
Py_CLEAR(bytes);
return NULL;
}
}

return bytes;
return PyBytesWriter_FinishWithSize(writer, bytes_size);
}

/*[clinic input]
Expand Down
Loading