mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-02 11:08:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

tuple.__repr__ did not consider a reference loop as it is not possible from

Browse source 
Python code; but it is possible from C.  object.__str__ had the issue of not
expecting a type to doing something within it's tp_str implementation that
could trigger an infinite recursion, but it could in C code..  Both found
thanks to BaseException and how it handles its repr.

Closes issue #1686386.  Thanks to Thomas Herve for taking an initial stab at
coming up with a solution.
This commit is contained in:
Brett Cannon 2007-09-30 19:45:10 +00:00
parent c537881caa
commit 0b14f243c4
3 changed files with 24 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Objects/tupleobject.c
View file

@ -216,6 +216,15 @@ tuplerepr(PyTupleObject *v)
PyObject *s, *temp;
PyObject *pieces, *result = NULL;
/* While not mutable, it is still possible to end up with a cycle in a
tuple through an object that stores itself within a tuple (and thus
infinitely asks for the repr of itself). This should only be
possible within a type. */
i = Py_ReprEnter((PyObject *)v);
if (i != 0) {
return i > 0 ? PyString_FromString("(...)") : NULL;
}
n = Py_Size(v);
if (n == 0)
return PyString_FromString("()");
@ -226,7 +235,10 @@ tuplerepr(PyTupleObject *v)
/* Do repr() on each element. */
for (i = 0; i < n; ++i) {
if (Py_EnterRecursiveCall(" while getting the repr of a tuple"))
goto Done;
s = PyObject_Repr(v->ob_item[i]);
Py_LeaveRecursiveCall();
if (s == NULL)
goto Done;
PyTuple_SET_ITEM(pieces, i, s);
@ -261,6 +273,7 @@ tuplerepr(PyTupleObject *v)
Done:
Py_DECREF(pieces);
Py_ReprLeave((PyObject *)v);
return result;
}