cpython: df8b40593a08 (original) (raw)

Mercurial > cpython

changeset 84515:df8b40593a08

Issue #18408: Fix _PyUnicodeWriter_Finish(): clear writer->buffer, so _PyUnicodeWriter_Dealloc() can be called on the writer after finish. [#18408]

Victor Stinner victor.stinner@gmail.com
date	Mon, 08 Jul 2013 22:29:55 +0200
parents	890496c5a4d6
children	c505ece63c80
files	Objects/unicodeobject.c
diffstat	1 files changed, 5 insertions(+), 2 deletions(-)[+] [-] Objects/unicodeobject.c 7

line wrap: on

line diff

--- a/Objects/unicodeobject.c +++ b/Objects/unicodeobject.c @@ -13157,6 +13157,7 @@ int PyObject * _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer) {

PyObject *str; if (writer->pos == 0) { Py_XDECREF(writer->buffer); _Py_RETURN_UNICODE_EMPTY();

@@ -13174,8 +13175,10 @@ PyObject * } 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