commit c15bdef8190241357970c9d65783c929860b933a
author Martin v. Löwis <martin@v.loewis.de> Fri May 29 14:47:46 2009 +0000
committer Martin v. Löwis <martin@v.loewis.de> Fri May 29 14:47:46 2009 +0000
tree 41a040a97ca95f748b6b4bc0ed4f2b39e5f729b1
parent 2703fd9134e46146df51b1af383632d5769faebd

Issue #6012: Add cleanup support to O& argument parsing.

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3bd1efd..47e0933 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1539,6 +1539,10 @@
     PyObject *output = NULL;
     Py_ssize_t size;
     void *data;
+    if (arg == NULL) {
+        Py_DECREF(*(PyObject**)addr);
+        return 1;
+    }
     if (PyBytes_Check(arg) || PyByteArray_Check(arg)) {
         output = arg;
         Py_INCREF(output);
@@ -1573,7 +1577,7 @@
         return 0;
     }
     *(PyObject**)addr = output;
-    return 1;
+    return Py_CLEANUP_SUPPORTED;
 }