Kaydet (Commit) 9b00dfae authored tarafından Guido van Rossum's avatar Guido van Rossum

If USE_STACKCHECK is defined use PyOS_CheckStack() in the repr and str

routines. This catches a slightly different set of crashes than the
recursive-repr fix.
(Jack)
üst f2044e1a
...@@ -162,6 +162,12 @@ PyObject_Print(op, fp, flags) ...@@ -162,6 +162,12 @@ PyObject_Print(op, fp, flags)
int ret = 0; int ret = 0;
if (PyErr_CheckSignals()) if (PyErr_CheckSignals())
return -1; return -1;
#ifdef USE_STACKCHECK
if (PyOS_CheckStack()) {
PyErr_SetString(PyExc_MemoryError, "Stack overflow");
return -1;
}
#endif
if (op == NULL) { if (op == NULL) {
fprintf(fp, "<nil>"); fprintf(fp, "<nil>");
} }
...@@ -213,6 +219,12 @@ PyObject_Repr(v) ...@@ -213,6 +219,12 @@ PyObject_Repr(v)
{ {
if (PyErr_CheckSignals()) if (PyErr_CheckSignals())
return NULL; return NULL;
#ifdef USE_STACKCHECK
if (PyOS_CheckStack()) {
PyErr_SetString(PyExc_MemoryError, "Stack overflow");
return NULL;
}
#endif
if (v == NULL) if (v == NULL)
return PyString_FromString("<NULL>"); return PyString_FromString("<NULL>");
else if (v->ob_type->tp_repr == NULL) { else if (v->ob_type->tp_repr == NULL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment