Skip to content

gh-129813, PEP 782: Use PyBytesWriter in _PyBytes_DecodeEscape2() #138838

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 1 commit into from
Sep 13, 2025
Merged

gh-129813, PEP 782: Use PyBytesWriter in _PyBytes_DecodeEscape2() #138838

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
24 changes: 10 additions & 14 deletions Objects/bytesobject.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1090,22 +1090,16 @@ PyObject *_PyBytes_DecodeEscape2(const char *s,
int *first_invalid_escape_char,
const char **first_invalid_escape_ptr)
{
int c;
char *p;
const char *end;
_PyBytesWriter writer;

_PyBytesWriter_Init(&writer);

p = _PyBytesWriter_Alloc(&writer, len);
if (p == NULL)
PyBytesWriter *writer = PyBytesWriter_Create(len);
if (writer == NULL) {
return NULL;
writer.overallocate = 1;
}
char *p = PyBytesWriter_GetData(writer);

*first_invalid_escape_char = -1;
*first_invalid_escape_ptr = NULL;

end = s + len;
const char *end = s + len;
while (s < end) {
if (*s != '\\') {
*p++ = *s++;
Expand Down Expand Up @@ -1134,7 +1128,8 @@ PyObject *_PyBytes_DecodeEscape2(const char *s,
case 'a': *p++ = '\007'; break; /* BEL, not classic C */
case '0': case '1': case '2': case '3':
case '4': case '5': case '6': case '7':
c = s[-1] - '0';
{
int c = s[-1] - '0';
if (s < end && '0' <= *s && *s <= '7') {
c = (c<<3) + *s++ - '0';
if (s < end && '0' <= *s && *s <= '7')
Expand All @@ -1149,6 +1144,7 @@ PyObject *_PyBytes_DecodeEscape2(const char *s,
}
*p++ = c;
break;
}
case 'x':
if (s+1 < end) {
int digit1, digit2;
Expand Down Expand Up @@ -1195,10 +1191,10 @@ PyObject *_PyBytes_DecodeEscape2(const char *s,
}
}

return _PyBytesWriter_Finish(&writer, p);
return PyBytesWriter_FinishWithPointer(writer, p);

failed:
_PyBytesWriter_Dealloc(&writer);
PyBytesWriter_Discard(writer);
return NULL;
}

Expand Down
Loading