From: Guido van Rossum <guido@python.org>
Date: Mon, 7 Aug 2000 19:18:27 +0000 (+0000)
Subject: Avoid dumping core when PyErr_NormalizeException() is called without
X-Git-Tag: v2.0b1~548
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ed473a46fc06d3e707821e5b83fa7210239a492d;p=python

Avoid dumping core when PyErr_NormalizeException() is called without
an exception set.  This shouldn't happen, but we see it at times...
---

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.
 	*/