Skip to content

bpo-39087: Use _PyUnicode_GetUTF8Buffer() in fileobject.c #18984

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

Closed
methane wants to merge 1 commit into from
Closed

bpo-39087: Use _PyUnicode_GetUTF8Buffer() in fileobject.c #18984

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
18 changes: 5 additions & 13 deletions Objects/fileobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,6 @@ static PyObject *
stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
{
PyObject *unicode;
PyObject *bytes = NULL;
const char *str;
Py_ssize_t n;
int err;

Expand All @@ -380,21 +378,15 @@ stdprinter_write(PyStdPrinter_Object *self, PyObject *args)
}

/* Encode Unicode to UTF-8/surrogateescape */
str = PyUnicode_AsUTF8AndSize(unicode, &n);
if (str == NULL) {
PyErr_Clear();
bytes = _PyUnicode_AsUTF8String(unicode, "backslashreplace");
if (bytes == NULL)
return NULL;
str = PyBytes_AS_STRING(bytes);
n = PyBytes_GET_SIZE(bytes);
Py_buffer buf;
if (_PyUnicode_GetUTF8Buffer(unicode, "backslashreplace", &buf) < 0) {
return NULL;
}

n = _Py_write(self->fd, str, n);
n = _Py_write(self->fd, buf.buf, buf.len);
/* save errno, it can be modified indirectly by Py_XDECREF() */
err = errno;

Py_XDECREF(bytes);
PyBuffer_Release(&buf);

if (n == -1) {
if (err == EAGAIN) {
Expand Down