diff options
author | bennorth <ben@redfrontdoor.org> | 2018-01-26 15:46:01 (GMT) |
---|---|---|
committer | Senthil Kumaran <skumaran@gatech.edu> | 2018-01-26 15:46:01 (GMT) |
commit | d7773d92bd11640a8c950d6c36a9cef1cee36f96 (patch) | |
tree | 31a2cf5300c58b15e50f0b480484e5beb7816c0c /Objects/dictobject.c | |
parent | e76daebc0c8afa3981a4c5a8b54537f756e805de (diff) | |
download | cpython-d7773d92bd11640a8c950d6c36a9cef1cee36f96.zip cpython-d7773d92bd11640a8c950d6c36a9cef1cee36f96.tar.gz cpython-d7773d92bd11640a8c950d6c36a9cef1cee36f96.tar.bz2 |
bpo-18533: Avoid RecursionError from repr() of recursive dictview (#4823)
dictview_repr(): Use a Py_ReprEnter() / Py_ReprLeave() pair to check
for recursion, and produce "..." if so.
test_recursive_repr(): Check for the string rather than a
RecursionError. (Test cannot be any tighter as contents are
implementation-dependent.)
test_deeply_nested_repr(): Add new test, replacing the original
test_recursive_repr(). It checks that a RecursionError is raised in
the case of a non-recursive but deeply nested structure. (Very
similar to what test_repr_deep() in test/test_dict.py does for a
normal dict.)
OrderedDictTests: Add new test case, to test behavior on OrderedDict
instances containing their own values() or items().
Diffstat (limited to 'Objects/dictobject.c')
-rw-r--r-- | Objects/dictobject.c | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/Objects/dictobject.c b/Objects/dictobject.c index 0d25739..bb4ea1f 100644 --- a/Objects/dictobject.c +++ b/Objects/dictobject.c @@ -3853,14 +3853,22 @@ static PyObject * dictview_repr(_PyDictViewObject *dv) { PyObject *seq; - PyObject *result; + PyObject *result = NULL; + Py_ssize_t rc; + rc = Py_ReprEnter((PyObject *)dv); + if (rc != 0) { + return rc > 0 ? PyUnicode_FromString("...") : NULL; + } seq = PySequence_List((PyObject *)dv); - if (seq == NULL) - return NULL; - + if (seq == NULL) { + goto Done; + } result = PyUnicode_FromFormat("%s(%R)", Py_TYPE(dv)->tp_name, seq); Py_DECREF(seq); + +Done: + Py_ReprLeave((PyObject *)dv); return result; } |