Move/copy assert for tstate != NULL before first use.

Verify that PyEval_Get{Globals,Locals} returned valid pointers.

Klocwork 231-232

diff --git a/Python/ceval.c b/Python/ceval.c
index cd8ff9b57c4efa90f1ac388ec91c1fb0e6b1c9d3..99e87e8100bf5df4846edfc102a980f1b7fd070e 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2623,6 +2623,7 @@ PyEval_EvalCodeEx(PyCodeObject *co, PyObject *globals, PyObject *locals,
                return NULL;
        }
 
+       assert(tstate != NULL);
        assert(globals != NULL);
        f = PyFrame_New(tstate, co, globals, locals);
        if (f == NULL)
@@ -3636,6 +3637,7 @@ fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
                   PyFrame_New() that doesn't take locals, but does
                   take builtins without sanity checking them.
                */
+               assert(tstate != NULL);
                f = PyFrame_New(tstate, co, globals, NULL);
                if (f == NULL)
                        return NULL;
@@ -3648,7 +3650,6 @@ fast_function(PyObject *func, PyObject ***pp_stack, int n, int na, int nk)
                        fastlocals[i] = *stack++;
                }
                retval = PyEval_EvalFrameEx(f,0);
-               assert(tstate != NULL);
                ++tstate->recursion_depth;
                Py_DECREF(f);
                --tstate->recursion_depth;
@@ -4130,6 +4131,11 @@ exec_statement(PyFrameObject *f, PyObject *prog, PyObject *globals,
                        locals = PyEval_GetLocals();
                        plain = 1;
                }
+               if (!globals || !locals) {
+                       PyErr_SetString(PyExc_SystemError,
+                                       "globals and locals cannot be NULL");
+                       return -1;
+               }
        }
        else if (locals == Py_None)
                locals = globals;