diff options
| author | Brett Cannon <bcannon@gmail.com> | 2007-09-07 04:18:30 (GMT) |
|---|---|---|
| committer | Brett Cannon <bcannon@gmail.com> | 2007-09-07 04:18:30 (GMT) |
| commit | 1e534b5425d836cb58a73d24f0be791d67bf3503 (patch) | |
| tree | 1f9fc8b8802c5ba236c026fc6cbe785d7f9bf20b /Objects/abstract.c | |
| parent | 68a6da99e6dc127d817143f74e98d665117f99c2 (diff) | |
| download | cpython-1e534b5425d836cb58a73d24f0be791d67bf3503.zip cpython-1e534b5425d836cb58a73d24f0be791d67bf3503.tar.gz cpython-1e534b5425d836cb58a73d24f0be791d67bf3503.tar.bz2 | |
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.
Diffstat (limited to 'Objects/abstract.c')
| -rw-r--r-- | Objects/abstract.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index f7a3bfe..7378e0d 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1857,7 +1857,11 @@ PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) ternaryfunc call; if ((call = func->ob_type->tp_call) != NULL) { - PyObject *result = (*call)(func, arg, kw); + PyObject *result; + if (Py_EnterRecursiveCall(" while calling a Python object")) + return NULL; + result = (*call)(func, arg, kw); + Py_LeaveRecursiveCall(); if (result == NULL && !PyErr_Occurred()) PyErr_SetString( PyExc_SystemError, |