mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-24 11:44:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merged revisions 65320 via svnmerge from

Browse source 
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.
........
This commit is contained in:
Benjamin Peterson 2008-07-31 01:47:08 +00:00
parent ebaf75dc0b
commit 69c88f74a3
2 changed files with 45 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Python/errors.c
View file

@ -157,9 +157,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;