Fix (and add test for) missing check for BaseException subclasses in the C

API.

diff --git a/Lib/test/test_exceptions.py b/Lib/test/test_exceptions.py
index 65f78766730bbe1a08dd0c9f66c87681972c15a9..7946142a2b179061b90c9e847ff85fa16b0a07ff 100644 (file)
--- a/Lib/test/test_exceptions.py
+++ b/Lib/test/test_exceptions.py
@@ -171,10 +171,15 @@ except Exception, e: pass
 # test that setting an exception at the C level works even if the
 # exception object can't be constructed.
 
-class BadException:
+class BadException(Exception):
     def __init__(self):
         raise RuntimeError, "can't instantiate BadException"
 
+# Exceptions must inherit from BaseException, raising invalid exception
+# should instead raise SystemError
+class InvalidException:
+    pass
+
 def test_capi1():
     import _testcapi
     try:
@@ -201,8 +206,21 @@ def test_capi2():
     else:
         print "Expected exception"
 
+def test_capi3():
+    import _testcapi
+    try:
+        _testcapi.raise_exception(InvalidException, 1)
+    except SystemError:
+        pass
+    except InvalidException:
+        raise AssertionError("Managed to raise InvalidException");
+    else:
+        print "Expected SystemError exception"
+    
+
 if not sys.platform.startswith('java'):
     test_capi1()
     test_capi2()
+    test_capi3()
 
 unlink(TESTFN)

diff --git a/Python/errors.c b/Python/errors.c
index a64900bfd2d2c00d1c6ca23216d17db5f400bf01..67f86ed36c2b610d80090b85e3f9dd7d9513008b 100644 (file)
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -47,6 +47,15 @@ PyErr_Restore(PyObject *type, PyObject *value, PyObject *traceback)
 void
 PyErr_SetObject(PyObject *exception, PyObject *value)
 {
+       if (exception != NULL &&
+           !PyExceptionClass_Check(exception)) {
+               PyObject *excstr = PyObject_Repr(exception);
+               PyErr_Format(PyExc_SystemError,
+                            "exception %s not a BaseException subclass",
+                            PyString_AS_STRING(excstr));
+               Py_DECREF(excstr);
+               return;
+       }
        Py_XINCREF(exception);
        Py_XINCREF(value);
        PyErr_Restore(exception, value, (PyObject *)NULL);