From 1e534b5425d836cb58a73d24f0be791d67bf3503 Mon Sep 17 00:00:00 2001 From: Brett Cannon Date: Fri, 7 Sep 2007 04:18:30 +0000 Subject: Fix a crasher where Python code managed to infinitely recurse in C code without ever going back out to Python code in PyObject_Call(). Required introducing a static RuntimeError instance so that normalizing an exception there is no reliance on a recursive call that would put the exception system over the recursion check itself. --- Python/errors.c | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Python/errors.c') diff --git a/Python/errors.c b/Python/errors.c index 3b8ea64f67..63acf33066 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -132,6 +132,7 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb) PyObject *value = *val; PyObject *inclass = NULL; PyObject *initial_tb = NULL; + PyThreadState *tstate = NULL; if (type == NULL) { /* There was no exception, so nothing to do. */ @@ -207,7 +208,14 @@ finally: Py_DECREF(initial_tb); } /* normalize recursively */ + tstate = PyThreadState_GET(); + if (++tstate->recursion_depth > Py_GetRecursionLimit()) { + --tstate->recursion_depth; + PyErr_SetObject(PyExc_RuntimeError, PyExc_RecursionErrorInst); + return; + } PyErr_NormalizeException(exc, val, tb); + --tstate->recursion_depth; } -- cgit v1.2.1