traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

- Issue #1686386: Tuple's tp_repr did not take into account the possibility of 

having a self-referential tuple, which is possible from C code.  Nor did
  object's tp_str consider that a type's tp_str could do something that could
  lead to an inifinite recursion.  Py_ReprEnter() and Py_EnterRecursiveCall(),
  respectively, fixed the issues.  (Backport of r58288 from trunk to 2.5.)
This commit is contained in:
Guido van Rossum 2008-04-10 22:43:58 +00:00
parent a6add69a63
commit aa975432d4
3 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Misc/NEWS
View File

@ -12,6 +12,12 @@ What's New in Python 2.5.3?
Core and builtins
-----------------
- Issue #1686386: Tuple's tp_repr did not take into account the possibility of
having a self-referential tuple, which is possible from C code. Nor did
object's tp_str consider that a type's tp_str could do something that could
lead to an inifinite recursion. Py_ReprEnter() and Py_EnterRecursiveCall(),
respectively, fixed the issues. (Backport of r58288 from trunk.)
- Patch #1442: properly report exceptions when the PYTHONSTARTUP file
cannot be executed.

6
Objects/object.c
View File

@ -403,7 +403,12 @@ _PyObject_Str(PyObject *v)
if (v->ob_type->tp_str == NULL)
return PyObject_Repr(v);
/* 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"))
return NULL;
res = (*v->ob_type->tp_str)(v);
Py_LeaveRecursiveCall();
if (res == NULL)
return NULL;
type_ok = PyString_Check(res);
@ -2141,4 +2146,3 @@ _PyTrash_destroy_chain(void)
#ifdef __cplusplus
}
#endif

13
Objects/tupleobject.c
View File

@ -208,6 +208,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 = v->ob_size;
if (n == 0)
return PyString_FromString("()");
@ -218,7 +227,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);
@ -253,6 +265,7 @@ tuplerepr(PyTupleObject *v)
Done:
Py_DECREF(pieces);
Py_ReprLeave((PyObject *)v);
return result;
}