diff options
| author | Victor Stinner <vstinner@python.org> | 2024-10-09 15:54:54 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-09 15:54:54 (GMT) |
| commit | 9bda7750c2af779d3431f5ea120db91c6c83ec49 (patch) | |
| tree | ca303da148f37b68a9ce93884774ca255ef205fb /Python | |
| parent | f978fb4f8d6eac0585057e463bb1701dc04a9900 (diff) | |
| download | cpython-9bda7750c2af779d3431f5ea120db91c6c83ec49.zip cpython-9bda7750c2af779d3431f5ea120db91c6c83ec49.tar.gz cpython-9bda7750c2af779d3431f5ea120db91c6c83ec49.tar.bz2 | |
gh-125196: Use PyUnicodeWriter in symtable.c (#125199)
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/symtable.c | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/Python/symtable.c b/Python/symtable.c index 52be910..709918b 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; } |