From 9d7855076a8e030e30459de685e762f63bdecac6 Mon Sep 17 00:00:00 2001 From: Guido van Rossum Date: Tue, 7 Mar 2006 18:31:44 +0000 Subject: [PATCH] Address an coverity issue. Coverity was complaining about a line that's fine, but an earlier line checked for v != NULL unnecessarily. --- Python/pythonrun.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 38f9c11000b..7b1f26439bc 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -1026,6 +1026,7 @@ PyErr_PrintEx(int set_sys_last_vars) 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 @@ PyErr_PrintEx(int set_sys_last_vars) 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;