From: Guido van Rossum <guido@python.org>
Date: Thu, 9 Apr 1992 14:58:08 +0000 (+0000)
Subject: Test for NULL coming out of err_get() in call_exc_trace()
X-Git-Tag: v0.9.8~368
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd9ccca81206cb4efc78ece65e079e729932de7f;p=thirdparty%2FPython%2Fcpython.git

Test for NULL coming out of err_get() in call_exc_trace()
---

diff --git a/Python/ceval.c b/Python/ceval.c
index ea1a78590b7c..0b2f924a84d7 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -1189,6 +1189,10 @@ call_exc_trace(p_trace, p_newtrace, f)
 	object *type, *value, *traceback, *arg;
 	int err;
 	err_get(&type, &value);
+	if (value == NULL) {
+		value = None;
+		INCREF(value);
+	}
 	traceback = tb_fetch();
 	arg = newtupleobject(3);
 	if (arg == NULL)