diff options
| -rw-r--r-- | Lib/test/test_raise.py | 9 | ||||
| -rw-r--r-- | Misc/NEWS | 3 | ||||
| -rw-r--r-- | Python/ceval.c | 7 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Lib/test/test_raise.py b/Lib/test/test_raise.py index d120dc1..e02c1af 100644 --- a/Lib/test/test_raise.py +++ b/Lib/test/test_raise.py @@ -121,6 +121,15 @@ class TestRaise(unittest.TestCase): else: self.fail("No exception raised") + def test_new_returns_invalid_instance(self): + # See issue #11627. + class MyException(Exception): + def __new__(cls, *args): + return object() + + with self.assertRaises(TypeError): + raise MyException + class TestCause(unittest.TestCase): def test_invalid_cause(self): @@ -10,6 +10,9 @@ What's New in Python 3.3 Alpha 1? Core and Builtins ----------------- +- Issue #11627: Fix segfault when __new__ on a exception returns a non-exception + class. + - Issue #12149: Update the method cache after a type's dictionnary gets cleared by the garbage collector. This fixes a segfault when an instance and its type get caught in a reference cycle, and the instance's diff --git a/Python/ceval.c b/Python/ceval.c index 5c93637..6d49363 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3494,6 +3494,13 @@ do_raise(PyObject *exc, PyObject *cause) value = PyObject_CallObject(exc, NULL); if (value == NULL) goto raise_error; + if (!PyExceptionInstance_Check(value)) { + PyErr_Format(PyExc_TypeError, + "calling %R should have returned an instance of " + "BaseException, not %R", + type, Py_TYPE(value)); + goto raise_error; + } } else if (PyExceptionInstance_Check(exc)) { value = exc; |