fix python#3653 Python could segfault if invalid values were passed t…

…o sys.excepthook Author: Daniel Diniz Reviewer: Georg Brandl
skrah · Aug 23, 2008 · 2658260 · 2658260
1 parent 3c9d2ef
commit 2658260
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1300,6 +1300,13 @@ print_exception(PyObject *f, PyObject *value)
 	int err = 0;
 	PyObject *type, *tb;
 
+	if (!PyExceptionInstance_Check(value)) {
+		PyFile_WriteString("TypeError: print_exception(): Exception expected for value, ", f);
+		PyFile_WriteString(Py_TYPE(value)->tp_name, f);
+		PyFile_WriteString(" found\n", f);
+		return;
+	}
+
 	Py_INCREF(value);
 	fflush(stdout);
 	type = (PyObject *) Py_TYPE(value);