Skip to content

gh-155742: Use PyBytesWriter in codecs #155750

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

Open
vstinner wants to merge 2 commits into
base: main
Choose a base branch
from
+6 −4
Open

gh-155742: Use PyBytesWriter in codecs #155750

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9b4154c
gh-155742: Use PyBytesWriter in codecs
vstinner Aug 13, 2026
304af9a
Update the comment about NULL result
vstinner Aug 13, 2026
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
10 changes: 6 additions & 4 deletions Python/codecs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1426,26 +1426,28 @@ _PyCodec_SurrogateEscapeUnicodeEncodeError(PyObject *exc)
return NULL;
}

PyObject *res = PyBytes_FromStringAndSize(NULL, slen);
if (res == NULL) {
PyBytesWriter *writer = PyBytesWriter_Create(slen);
if (writer == NULL) {
Py_DECREF(obj);
return NULL;
}

char *outp = PyBytes_AsString(res);
char *outp = PyBytesWriter_GetData(writer);
for (Py_ssize_t i = start; i < end; i++) {
Py_UCS4 ch = PyUnicode_READ_CHAR(obj, i);
if (ch < 0xdc80 || ch > 0xdcff) {
/* Not a UTF-8b surrogate, fail with original exception. */
Py_DECREF(obj);
Py_DECREF(res);
PyBytesWriter_Discard(writer);
PyErr_SetObject(PyExceptionInstance_Class(exc), exc);
return NULL;
}
*outp++ = ch - 0xdc00;
}
Py_DECREF(obj);

PyObject *res = PyBytesWriter_Finish(writer);
// Py_BuildValue() propagates the exception if res is NULL
return Py_BuildValue("(Nn)", res, end);
}

Expand Down
Loading