From 2658260f3b4984b03e60cc5856e1203e0cd1f807 Mon Sep 17 00:00:00 2001
From: Benjamin Peterson <benjamin@python.org>
Date: Sat, 23 Aug 2008 20:08:07 +0000
Subject: fix #3653 Python could segfault if invalid values were passed to
 sys.excepthook

Author: Daniel Diniz
Reviewer: Georg Brandl
---
 Python/pythonrun.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index a1777bd..1ee062f 100644
--- 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);
-- 
cgit v0.12