Avoid dumping core when PyErr_NormalizeException() is called without

an exception set.  This shouldn't happen, but we see it at times...

1 files changed, 6 insertions, 0 deletions

diff --git a/Python/errors.c b/Python/errors.c
index 24eeead9ce..a9e4daed9b 100644
--- a/Python/errors.c
+++ b/Python/errors.c
@@ -136,6 +136,12 @@ PyErr_NormalizeException(PyObject **exc, PyObject **val, PyObject **tb)
 	PyObject *value = *val;
 	PyObject *inclass = NULL;
 
+	if (type == NULL) {
+		/* This is a bug.  Should never happen.  Don't dump core. */
+		PyErr_SetString(PyExc_SystemError,
+			"PyErr_NormalizeException() called without exception");
+	}
+
 	/* If PyErr_SetNone() was used, the value will have been actually
 	   set to NULL.
 	*/