From: Victor Stinner <victor.stinner@gmail.com>
Date: Mon, 8 Jul 2013 22:37:24 +0000 (+0200)
Subject: Issue #18408: _PyUnicodeWriter_Finish() now clears its buffer attribute in all
X-Git-Tag: v3.4.0a1~275
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9e6b4d715c46c0fa518fd76440b59516a9f6f7ea;p=thirdparty%2FPython%2Fcpython.git

Issue #18408: _PyUnicodeWriter_Finish() now clears its buffer attribute in all
cases, so _PyUnicodeWriter_Dealloc() can be called after finish.
---

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 96c7c5825e01..1a448824f7ab 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13159,18 +13159,21 @@ _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
 {
     PyObject *str;
     if (writer->pos == 0) {
-        Py_XDECREF(writer->buffer);
+        Py_CLEAR(writer->buffer);
         _Py_RETURN_UNICODE_EMPTY();
     }
     if (writer->readonly) {
-        assert(PyUnicode_GET_LENGTH(writer->buffer) == writer->pos);
-        return writer->buffer;
+        str = writer->buffer;
+        writer->buffer = NULL;
+        assert(PyUnicode_GET_LENGTH(str) == writer->pos);
+        return str;
     }
     if (PyUnicode_GET_LENGTH(writer->buffer) != writer->pos) {
         PyObject *newbuffer;
         newbuffer = resize_compact(writer->buffer, writer->pos);
         if (newbuffer == NULL) {
             Py_DECREF(writer->buffer);
+            writer->buffer = NULL;
             return NULL;
         }
         writer->buffer = newbuffer;