mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Vladimir MARANGOZOV <Vladimir.Marangozov@inrialpes.fr>:

Browse source 
This patch fixes an optimisation mystery in _PyUnicodeNew causing segfaults
on AIX when the interpreter is compiled with -O.
This commit is contained in:
Marc-André Lemburg 2000-06-17 20:31:17 +00:00
parent b248b7f848
commit bea47e768d
1 changed files with 4 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Objects/unicodeobject.c
View file

@ -213,9 +213,8 @@ PyUnicodeObject *_PyUnicode_New(int length)
/* Unicode freelist & memory allocation */ /* Unicode freelist & memory allocation */
if (unicode_freelist) { if (unicode_freelist) {
unicode = unicode_freelist; unicode = unicode_freelist;
unicode_freelist = *(PyUnicodeObject **)unicode_freelist; unicode_freelist = *(PyUnicodeObject **)unicode;
unicode_freelist_size--; unicode_freelist_size--;
PyObject_INIT(unicode, &PyUnicode_Type);
if (unicode->str) { if (unicode->str) {
/* Keep-Alive optimization: we only upsize the buffer, /* Keep-Alive optimization: we only upsize the buffer,
never downsize it. */ never downsize it. */
@ -225,8 +224,10 @@ PyUnicodeObject *_PyUnicode_New(int length)
goto onError; goto onError;
} }
} }
else else {
unicode->str = PyMem_NEW(Py_UNICODE, length + 1); unicode->str = PyMem_NEW(Py_UNICODE, length + 1);
}
PyObject_INIT(unicode, &PyUnicode_Type);
} }
else { else {
unicode = PyObject_NEW(PyUnicodeObject, &PyUnicode_Type); unicode = PyObject_NEW(PyUnicodeObject, &PyUnicode_Type);