cpython: 7e86fa255fc2 (original) (raw)

Mercurial > cpython

changeset 52711:7e86fa255fc2 legacy-trunk

In PyErr_GivenExceptionMatches, temporarily bump the recursion limit, so that in the most common case PyObject_IsSubclass will not raise a recursion error we have to ignore anyway.

Georg Brandl georg@python.org
date Thu, 02 Apr 2009 02:47:44 +0000
parents b984456196af
children f634c5455b4f
files Python/errors.c
diffstat 1 files changed, 7 insertions(+), 1 deletions(-)[+] [-] Python/errors.c 8

line wrap: on

line diff

--- a/Python/errors.c +++ b/Python/errors.c @@ -106,10 +106,16 @@ PyErr_GivenExceptionMatches(PyObject *er err = PyExceptionInstance_Class(err); if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) { - int res = 0; + int res = 0, reclimit; PyObject *exception, *value, tb; PyErr_Fetch(&exception, &value, &tb); + / Temporarily bump the recursion limit, so that in the most + common case PyObject_IsSubclass will not raise a recursion + error we have to ignore anyway. / + reclimit = Py_GetRecursionLimit(); + Py_SetRecursionLimit(reclimit + 5); res = PyObject_IsSubclass(err, exc); + Py_SetRecursionLimit(reclimit); / This function must not fail, so print the error here */ if (res == -1) { PyErr_WriteUnraisable(err);