Skip to content

gh-125196: Use PyUnicodeWriter in symtable.c #125199

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
Oct 9, 2024
Merged

gh-125196: Use PyUnicodeWriter in symtable.c #125199

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
35 changes: 16 additions & 19 deletions Python/symtable.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3120,33 +3120,30 @@ _Py_Mangle(PyObject *privateobj, PyObject *ident)
if (ipriv == plen) {
return Py_NewRef(ident); /* Don't mangle if class is just underscores */
}
plen -= ipriv;

if (plen + nlen >= PY_SSIZE_T_MAX - 1) {
if (nlen + (plen - ipriv) >= PY_SSIZE_T_MAX - 1) {
PyErr_SetString(PyExc_OverflowError,
"private identifier too large to be mangled");
return NULL;
}

Py_UCS4 maxchar = PyUnicode_MAX_CHAR_VALUE(ident);
if (PyUnicode_MAX_CHAR_VALUE(privateobj) > maxchar) {
maxchar = PyUnicode_MAX_CHAR_VALUE(privateobj);
}

PyObject *result = PyUnicode_New(1 + nlen + plen, maxchar);
if (!result) {
PyUnicodeWriter *writer = PyUnicodeWriter_Create(1 + nlen + (plen - ipriv));
if (!writer) {
return NULL;
}
/* ident = "_" + priv[ipriv:] + ident # i.e. 1+plen+nlen bytes */
PyUnicode_WRITE(PyUnicode_KIND(result), PyUnicode_DATA(result), 0, '_');
if (PyUnicode_CopyCharacters(result, 1, privateobj, ipriv, plen) < 0) {
Py_DECREF(result);
return NULL;
// ident = "_" + priv[ipriv:] + ident
if (PyUnicodeWriter_WriteChar(writer, '_') < 0) {
goto error;
}
if (PyUnicode_CopyCharacters(result, plen+1, ident, 0, nlen) < 0) {
Py_DECREF(result);
return NULL;
if (PyUnicodeWriter_WriteSubstring(writer, privateobj, ipriv, plen) < 0) {
goto error;
}
assert(_PyUnicode_CheckConsistency(result, 1));
return result;
if (PyUnicodeWriter_WriteStr(writer, ident) < 0) {
goto error;
}
return PyUnicodeWriter_Finish(writer);

error:
PyUnicodeWriter_Discard(writer);
return NULL;
}
Loading