[Python-checkins] cpython: Issue #18408: Fix _PyUnicodeWriter_Finish(): clear writer->buffer,
victor.stinner
python-checkins at python.org
Mon Jul 8 22:36:42 CEST 2013
http://hg.python.org/cpython/rev/df8b40593a08
changeset: 84515:df8b40593a08
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Jul 08 22:29:55 2013 +0200
summary:
Issue #18408: Fix _PyUnicodeWriter_Finish(): clear writer->buffer,
so _PyUnicodeWriter_Dealloc() can be called on the writer after finish.
files:
Objects/unicodeobject.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13157,6 +13157,7 @@
PyObject *
_PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
{
+ PyObject *str;
if (writer->pos == 0) {
Py_XDECREF(writer->buffer);
_Py_RETURN_UNICODE_EMPTY();
@@ -13174,8 +13175,10 @@
}
writer->buffer = newbuffer;
}
- assert(_PyUnicode_CheckConsistency(writer->buffer, 1));
- return unicode_result_ready(writer->buffer);
+ str = writer->buffer;
+ writer->buffer = NULL;
+ assert(_PyUnicode_CheckConsistency(str, 1));
+ return unicode_result_ready(str);
}
void
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list