]> granicus.if.org Git - python/commitdiff
Address an coverity issue. Coverity was complaining about a line that's fine,
authorGuido van Rossum <guido@python.org>
Tue, 7 Mar 2006 18:31:44 +0000 (18:31 +0000)
committerGuido van Rossum <guido@python.org>
Tue, 7 Mar 2006 18:31:44 +0000 (18:31 +0000)
but an earlier line checked for v != NULL unnecessarily.

Python/pythonrun.c

index 38f9c11000ba5bcef52a9a5e9375d386e688316c..7b1f26439bc0188517c92cf5f2946fe4a1bc07d4 100644 (file)
@@ -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;