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

Fix SF bug #667147, Segmentation fault printing str subclass

Browse source 
Fix infinite recursion which occurred when printing an object
whose __str__() returned self.

Will backport
This commit is contained in:
Neal Norwitz 2003-01-13 20:13:12 +00:00
parent a974b3939f
commit 1a9975014f
3 changed files with 43 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Objects/object.c
View file

@ -158,10 +158,15 @@ _PyObject_Del(PyObject *op)
PyObject_FREE(op);
}
int
PyObject_Print(PyObject *op, FILE *fp, int flags)
/* Implementation of PyObject_Print with recursion checking */
static int
internal_print(PyObject *op, FILE *fp, int flags, int nesting)
{
int ret = 0;
if (nesting > 10) {
PyErr_SetString(PyExc_RuntimeError, "print recursion");
return -1;
}
if (PyErr_CheckSignals())
return -1;
#ifdef USE_STACKCHECK
@ -187,7 +192,8 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
if (s == NULL)
ret = -1;
else {
ret = PyObject_Print(s, fp, Py_PRINT_RAW);
ret = internal_print(s, fp, Py_PRINT_RAW,
nesting+1);
}
Py_XDECREF(s);
}
@ -204,6 +210,13 @@ PyObject_Print(PyObject *op, FILE *fp, int flags)
return ret;
}
int
PyObject_Print(PyObject *op, FILE *fp, int flags)
{
return internal_print(op, fp, flags, 0);
}
/* For debugging convenience. See Misc/gdbinit for some useful gdb hooks */
void _PyObject_Dump(PyObject* op)
{