]> granicus.if.org Git - python/commitdiff
Fix PyObject_Repr(): don't call PyUnicode_READY() if res is NULL
authorVictor Stinner <victor.stinner@haypocalc.com>
Thu, 1 Dec 2011 02:22:44 +0000 (03:22 +0100)
committerVictor Stinner <victor.stinner@haypocalc.com>
Thu, 1 Dec 2011 02:22:44 +0000 (03:22 +0100)
Objects/object.c

index eea55318ebcc379f75dea08d509486e9557ab40d..ad31738d49d927757624ac0e330cfa20b8c7e37a 100644 (file)
@@ -378,7 +378,9 @@ PyObject_Repr(PyObject *v)
         return PyUnicode_FromFormat("<%s object at %p>",
                                     v->ob_type->tp_name, v);
     res = (*v->ob_type->tp_repr)(v);
-    if (res != NULL && !PyUnicode_Check(res)) {
+    if (res == NULL)
+        return NULL;
+    if (!PyUnicode_Check(res)) {
         PyErr_Format(PyExc_TypeError,
                      "__repr__ returned non-string (type %.200s)",
                      res->ob_type->tp_name);