mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-01 02:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

Issue #18408: _PyUnicodeWriter_Finish() now clears its buffer attribute in all

Browse source 
cases, so _PyUnicodeWriter_Dealloc() can be called after finish.
This commit is contained in:
Victor Stinner 2013-07-09 00:37:24 +02:00
parent 7979926616
commit 9e6b4d715c
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Objects/unicodeobject.c
View file

@ -13159,18 +13159,21 @@ _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
{ {
PyObject *str; PyObject *str;
if (writer->pos == 0) { if (writer->pos == 0) {
Py_XDECREF(writer->buffer); Py_CLEAR(writer->buffer);
_Py_RETURN_UNICODE_EMPTY(); _Py_RETURN_UNICODE_EMPTY();
} }
if (writer->readonly) { if (writer->readonly) {
assert(PyUnicode_GET_LENGTH(writer->buffer) == writer->pos); str = writer->buffer;
return writer->buffer; writer->buffer = NULL;
assert(PyUnicode_GET_LENGTH(str) == writer->pos);
return str;
} }
if (PyUnicode_GET_LENGTH(writer->buffer) != writer->pos) { if (PyUnicode_GET_LENGTH(writer->buffer) != writer->pos) {
PyObject *newbuffer; PyObject *newbuffer;
newbuffer = resize_compact(writer->buffer, writer->pos); newbuffer = resize_compact(writer->buffer, writer->pos);
if (newbuffer == NULL) { if (newbuffer == NULL) {
Py_DECREF(writer->buffer); Py_DECREF(writer->buffer);
writer->buffer = NULL;
return NULL; return NULL;
} }
writer->buffer = newbuffer; writer->buffer = newbuffer;