Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

gh-114569: Use PyMem_* APIs for non-PyObjects in unicodeobject.c (#114690)

This commit is contained in:
Erlend E. Aasland 2024-01-29 21:48:49 +01:00 committed by GitHub
parent 29952c86f3
commit 53d921ed96
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Objects/unicodeobject.c
View File

@ -996,7 +996,7 @@ resize_compact(PyObject *unicode, Py_ssize_t length)
new_size = (struct_size + (length + 1) * char_size); new_size = (struct_size + (length + 1) * char_size);
if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) { if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) {
PyObject_Free(_PyUnicode_UTF8(unicode)); PyMem_Free(_PyUnicode_UTF8(unicode));
_PyUnicode_UTF8(unicode) = NULL; _PyUnicode_UTF8(unicode) = NULL;
_PyUnicode_UTF8_LENGTH(unicode) = 0; _PyUnicode_UTF8_LENGTH(unicode) = 0;
} }
@ -1049,7 +1049,7 @@ resize_inplace(PyObject *unicode, Py_ssize_t length)
if (!share_utf8 && _PyUnicode_HAS_UTF8_MEMORY(unicode)) if (!share_utf8 && _PyUnicode_HAS_UTF8_MEMORY(unicode))
{ {
PyObject_Free(_PyUnicode_UTF8(unicode)); PyMem_Free(_PyUnicode_UTF8(unicode));
_PyUnicode_UTF8(unicode) = NULL; _PyUnicode_UTF8(unicode) = NULL;
_PyUnicode_UTF8_LENGTH(unicode) = 0; _PyUnicode_UTF8_LENGTH(unicode) = 0;
} }
@ -1590,10 +1590,10 @@ unicode_dealloc(PyObject *unicode)
return; return;
} }
if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) { if (_PyUnicode_HAS_UTF8_MEMORY(unicode)) {
PyObject_Free(_PyUnicode_UTF8(unicode)); PyMem_Free(_PyUnicode_UTF8(unicode));
} }
if (!PyUnicode_IS_COMPACT(unicode) && _PyUnicode_DATA_ANY(unicode)) { if (!PyUnicode_IS_COMPACT(unicode) && _PyUnicode_DATA_ANY(unicode)) {
PyObject_Free(_PyUnicode_DATA_ANY(unicode)); PyMem_Free(_PyUnicode_DATA_ANY(unicode));
} }
Py_TYPE(unicode)->tp_free(unicode); Py_TYPE(unicode)->tp_free(unicode);
@ -5203,7 +5203,7 @@ unicode_fill_utf8(PyObject *unicode)
PyBytes_AS_STRING(writer.buffer); PyBytes_AS_STRING(writer.buffer);
Py_ssize_t len = end - start; Py_ssize_t len = end - start;
char *cache = PyObject_Malloc(len + 1); char *cache = PyMem_Malloc(len + 1);
if (cache == NULL) { if (cache == NULL) {
_PyBytesWriter_Dealloc(&writer); _PyBytesWriter_Dealloc(&writer);
PyErr_NoMemory(); PyErr_NoMemory();
@ -14674,7 +14674,7 @@ unicode_subtype_new(PyTypeObject *type, PyObject *unicode)
PyErr_NoMemory(); PyErr_NoMemory();
goto onError; goto onError;
} }
data = PyObject_Malloc((length + 1) * char_size); data = PyMem_Malloc((length + 1) * char_size);
if (data == NULL) { if (data == NULL) {
PyErr_NoMemory(); PyErr_NoMemory();
goto onError; goto onError;