mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-18 22:50:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #28408: Fixed a leak and remove redundant code in _PyUnicodeWriter_Finish().

Browse source 
Patch by Xiang Zhang.
This commit is contained in:
Serhiy Storchaka 2016-10-25 13:23:56 +03:00
parent c3adf1e09b
commit c8bc3d1c07
1 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Objects/unicodeobject.c
View file

@ -13570,34 +13570,28 @@ PyObject *
_PyUnicodeWriter_Finish(_PyUnicodeWriter *writer) _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
{ {
PyObject *str; PyObject *str;
if (writer->pos == 0) { if (writer->pos == 0) {
Py_CLEAR(writer->buffer); Py_CLEAR(writer->buffer);
_Py_RETURN_UNICODE_EMPTY(); _Py_RETURN_UNICODE_EMPTY();
} }
if (writer->readonly) {
str = writer->buffer; str = writer->buffer;
writer->buffer = NULL; writer->buffer = NULL;
if (writer->readonly) {
assert(PyUnicode_GET_LENGTH(str) == writer->pos); assert(PyUnicode_GET_LENGTH(str) == writer->pos);
return str; return str;
} }
if (writer->pos == 0) {
Py_CLEAR(writer->buffer);
/* Get the empty Unicode string singleton ('') */
_Py_INCREF_UNICODE_EMPTY();
str = unicode_empty;
}
else {
str = writer->buffer;
writer->buffer = NULL;
if (PyUnicode_GET_LENGTH(str) != writer->pos) { if (PyUnicode_GET_LENGTH(str) != writer->pos) {
PyObject *str2; PyObject *str2;
str2 = resize_compact(str, writer->pos); str2 = resize_compact(str, writer->pos);
if (str2 == NULL) if (str2 == NULL) {
Py_DECREF(str);
return NULL; return NULL;
str = str2;
} }
str = str2;
} }
assert(_PyUnicode_CheckConsistency(str, 1)); assert(_PyUnicode_CheckConsistency(str, 1));