Skip to content

gh-156939: Update UTF-8 encoder for PyBytesWriter changes #157383

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 −6
Merged

gh-156939: Update UTF-8 encoder for PyBytesWriter changes #157383

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
13 changes: 7 additions & 6 deletions Objects/stringlib/codecs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,6 @@ STRINGLIB(utf8_encoder)(PyObject *unicode,
break;

case _Py_ERROR_BACKSLASHREPLACE:
/* subtract preallocated bytes */
writer->size -= max_char_size * (endpos - startpos);
p = backslashreplace(writer, p,
unicode, startpos, endpos);
if (p == NULL)
Expand All @@ -360,8 +358,6 @@ STRINGLIB(utf8_encoder)(PyObject *unicode,
break;

case _Py_ERROR_XMLCHARREFREPLACE:
/* subtract preallocated bytes */
writer->size -= max_char_size * (endpos - startpos);
p = xmlcharrefreplace(writer, p,
unicode, startpos, endpos);
if (p == NULL)
Expand Down Expand Up @@ -400,10 +396,15 @@ STRINGLIB(utf8_encoder)(PyObject *unicode,
}
}
else {
/* subtract preallocated bytes */
writer->size -= max_char_size * (newpos - startpos);
/* Only overallocate the buffer if it's not the last write */
writer->overallocate = (newpos < size);

/* subtract preallocated bytes */
Py_ssize_t prealloc = max_char_size * (newpos - startpos);
p = PyBytesWriter_GrowAndUpdatePointer(writer, -prealloc, p);
if (p == NULL) {
goto error;
}
}

const char *rep_str;
Expand Down
Loading