https://github.com/python/cpython/commit/9bda7750c2af779d3431f5ea120db91c6c83ec49
commit: 9bda7750c2af779d3431f5ea120db91c6c83ec49
branch: main
author: Victor Stinner <[email protected]>
committer: vstinner <[email protected]>
date: 2024-10-09T17:54:54+02:00
summary:
gh-125196: Use PyUnicodeWriter in symtable.c (#125199)
files:
M Python/symtable.c
diff --git a/Python/symtable.c b/Python/symtable.c
index 52be910c0b6a9b..709918b27afcc8 100644
--- a/Python/symtable.c
+++ b/Python/symtable.c
@@ -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;
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
