[Python-checkins] r42898 - python/trunk/Python/pythonrun.c

[guido.van.rossum]

Author: guido.van.rossum
Date: Tue Mar  7 19:31:44 2006
New Revision: 42898

Modified:
   python/trunk/Python/pythonrun.c
Log:
Address an coverity issue.  Coverity was complaining about a line that's fine,
but an earlier line checked for v != NULL unnecessarily.


Modified: python/trunk/Python/pythonrun.c
==============================================================================
--- python/trunk/Python/pythonrun.c	(original)
+++ python/trunk/Python/pythonrun.c	Tue Mar  7 19:31:44 2006
@@ -1026,6 +1026,7 @@
 	PyErr_NormalizeException(&exception, &v, &tb);
 	if (exception == NULL)
 		return;
+        /* Now we know v != NULL too */
 	if (set_sys_last_vars) {
 		PySys_SetObject("last_type", exception);
 		PySys_SetObject("last_value", v);
@@ -1034,7 +1035,7 @@
 	hook = PySys_GetObject("excepthook");
 	if (hook) {
 		PyObject *args = PyTuple_Pack(3,
-		    exception, v ? v : Py_None, tb ? tb : Py_None);
+		    exception, v, tb ? tb : Py_None);
 		PyObject *result = PyEval_CallObject(hook, args);
 		if (result == NULL) {
 			PyObject *exception2, *v2, *tb2;