commit c20c97f6122e7a99e46cbd6c9ac8cb2941a3bf7a
author bennorth <ben@redfrontdoor.org> Mon Feb 26 22:35:03 2018 +0000
committer Serhiy Storchaka <storchaka@gmail.com> Tue Feb 27 00:35:03 2018 +0200
tree 5195b4d10abe15450121bfcc31dc3c9c4b096bae
parent ecaa372f74eeb6c032791c520af6b23e527d335f

bpo-18533: Avoid RuntimeError from repr() of recursive dictview (#4823) (#5357)

(cherry picked from commit d7773d92bd11640a8c950d6c36a9cef1cee36f96)

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index a792b2d..c544ecd 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -3005,21 +3005,29 @@
 {
     PyObject *seq;
     PyObject *seq_str;
-    PyObject *result;
+    PyObject *result = NULL;
+    Py_ssize_t rc;
 
+    rc = Py_ReprEnter((PyObject *)dv);
+    if (rc != 0) {
+        return rc > 0 ? PyString_FromString("...") : NULL;
+    }
     seq = PySequence_List((PyObject *)dv);
-    if (seq == NULL)
-        return NULL;
-
+    if (seq == NULL) {
+        goto Done;
+    }
     seq_str = PyObject_Repr(seq);
+    Py_DECREF(seq);
+
     if (seq_str == NULL) {
-        Py_DECREF(seq);
-        return NULL;
+        goto Done;
     }
     result = PyString_FromFormat("%s(%s)", Py_TYPE(dv)->tp_name,
                                  PyString_AS_STRING(seq_str));
     Py_DECREF(seq_str);
-    Py_DECREF(seq);
+
+Done:
+    Py_ReprLeave((PyObject *)dv);
     return result;
 }