mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-11 11:17:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

#2542: now that issubclass() may call arbitrary code,

Browse source 
make sure that PyErr_ExceptionMatches returns 0 when an exception occurs there.
This commit is contained in:
Amaury Forgeot d'Arc 2008-07-31 00:42:16 +00:00
parent b8827c00b8
commit 246daedd11
3 changed files with 49 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/errors.c
View file

@ -106,9 +106,18 @@ PyErr_GivenExceptionMatches(PyObject *err, PyObject *exc)
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;