pythongh-125196: PyUnicodeWriter_Discard(NULL) does nothing

vstinner · Oct 9, 2024 · 5e51ebf · 5e51ebf
1 parent 52f70da
commit 5e51ebf
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Doc/c-api/unicode.rst b/Doc/c-api/unicode.rst
@@ -1600,6 +1600,8 @@ object.
 
    Discard the internal Unicode buffer and destroy the writer instance.
 
+   Do nothing if *writer* is ``NULL``.
+
 .. c:function:: int PyUnicodeWriter_WriteChar(PyUnicodeWriter *writer, Py_UCS4 ch)
 
    Write the single Unicode character *ch* into *writer*.

diff --git a/Objects/listobject.c b/Objects/listobject.c
@@ -563,9 +563,7 @@ list_repr_impl(PyListObject *v)
     return PyUnicodeWriter_Finish(writer);
 
 error:
-    if (writer != NULL) {
-        PyUnicodeWriter_Discard(writer);
-    }
+    PyUnicodeWriter_Discard(writer);
     Py_ReprLeave((PyObject *)v);
     return NULL;
 }

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
@@ -13455,6 +13455,9 @@ PyUnicodeWriter_Create(Py_ssize_t length)
 
 void PyUnicodeWriter_Discard(PyUnicodeWriter *writer)
 {
+    if (writer == NULL) {
+        return;
+    }
     _PyUnicodeWriter_Dealloc((_PyUnicodeWriter*)writer);
     PyMem_Free(writer);
 }