Issue #18408: Fix _PyUnicodeWriter_Finish(): clear writer->buffer,

so _PyUnicodeWriter_Dealloc() can be called on the writer after finish.

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index ac5f66aeaaa7f90a5ccd3b262e4a78a47c1a6238..96c7c5825e01a3129dab7c4aac488df72e4c6168 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -13157,6 +13157,7 @@ _PyUnicodeWriter_WriteCstr(_PyUnicodeWriter *writer, const char *str, Py_ssize_t
 PyObject *
 _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
 {
+    PyObject *str;
     if (writer->pos == 0) {
         Py_XDECREF(writer->buffer);
         _Py_RETURN_UNICODE_EMPTY();
@@ -13174,8 +13175,10 @@ _PyUnicodeWriter_Finish(_PyUnicodeWriter *writer)
         }
         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