Mercurial > cpython-lru_cache-weakref
diff Python/errors.c @ 48589:1ec38b707cd6
Merged revisions 65320 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r65320 | amaury.forgeotdarc | 2008-07-30 19:42:16 -0500 (Wed, 30 Jul 2008) | 3 lines
#2542: now that issubclass() may call arbitrary code,
make sure that PyErr_ExceptionMatches returns 0 when an exception occurs there.
........
| author | Benjamin Peterson <benjamin@python.org> |
|---|---|
| date | Thu, 31 Jul 2008 01:47:08 +0000 |
| parents | 2ee09afee126 |
| children | de75e7280b7a |
line wrap: on
line diff
--- a/Python/errors.c Wed Jul 30 23:51:05 2008 +0000 +++ b/Python/errors.c Thu Jul 31 01:47:08 2008 +0000 @@ -157,9 +157,18 @@ err = PyExceptionInstance_Class(err); if (PyExceptionClass_Check(err) && PyExceptionClass_Check(exc)) { - /* problems here!? not sure PyObject_IsSubclass expects to - be called with an exception pending... */ - return PyObject_IsSubclass(err, exc); + int res = 0; + PyObject *exception, *value, *tb; + PyErr_Fetch(&exception, &value, &tb); + res = PyObject_IsSubclass(err, exc); + /* This function must not fail, so print the error here */ + if (res == -1) { + PyErr_WriteUnraisable(err); + /* issubclass did not succeed */ + res = 0; + } + PyErr_Restore(exception, value, tb); + return res; } return err == exc;