From: Victor Stinner <vstinner@wyplay.com>
Date: Mon, 26 Aug 2013 12:05:19 +0000 (+0200)
Subject: Restore changeset 5bd9db528aed (issue #18408)
X-Git-Tag: v3.4.0a2~105
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33824f6fd70f89dd39fcb7ed1651e8097c57d340;p=thirdparty%2FPython%2Fcpython.git

Restore changeset 5bd9db528aed (issue #18408)

"Issue #18408: PyObject_Str(), PyObject_Repr() and type_call() now fail with an
assertion error if they are called with an exception set (PyErr_Occurred()).

As PyEval_EvalFrameEx(), they may clear the current exception and so the caller
looses its exception."
---

diff --git a/Objects/object.c b/Objects/object.c
index 006f0d4dbc34..693d8c73b1c6 100644
--- a/Objects/object.c
+++ b/Objects/object.c
@@ -449,6 +449,14 @@ PyObject_Repr(PyObject *v)
     if (Py_TYPE(v)->tp_repr == NULL)
         return PyUnicode_FromFormat("<%s object at %p>",
                                     v->ob_type->tp_name, v);
+
+#ifdef Py_DEBUG
+    /* PyObject_Repr() must not be called with an exception set,
+       because it may clear it (directly or indirectly) and so the
+       caller looses its exception */
+    assert(!PyErr_Occurred());
+#endif
+
     res = (*v->ob_type->tp_repr)(v);
     if (res == NULL)
         return NULL;
@@ -491,6 +499,13 @@ PyObject_Str(PyObject *v)
     if (Py_TYPE(v)->tp_str == NULL)
         return PyObject_Repr(v);
 
+#ifdef Py_DEBUG
+    /* PyObject_Str() must not be called with an exception set,
+       because it may clear it (directly or indirectly) and so the
+       caller looses its exception */
+    assert(!PyErr_Occurred());
+#endif
+
     /* It is possible for a type to have a tp_str representation that loops
        infinitely. */
     if (Py_EnterRecursiveCall(" while getting the str of an object"))
diff --git a/Objects/typeobject.c b/Objects/typeobject.c
index c6ff0193e7f4..3ff42da1dd65 100644
--- a/Objects/typeobject.c
+++ b/Objects/typeobject.c
@@ -736,6 +736,13 @@ type_call(PyTypeObject *type, PyObject *args, PyObject *kwds)
         return NULL;
     }
 
+#ifdef Py_DEBUG
+    /* type_call() must not be called with an exception set,
+       because it may clear it (directly or indirectly) and so the
+       caller looses its exception */
+    assert(!PyErr_Occurred());
+#endif
+
     obj = type->tp_new(type, args, kwds);
     if (obj != NULL) {
         /* Ugly exception: when the call was type(something),