bug [ 868706 ] Calling builtin function 'eval' from C causes seg fault.

diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
index 2cadb49cfeed8016cc23ce650bbe3bbd6bf7d7ee..d4e9a22e5f4391cd4d4bb59722ffde88405159c3 100644 (file)
--- a/Python/bltinmodule.c
+++ b/Python/bltinmodule.c
@@ -542,6 +542,13 @@ builtin_eval(PyObject *self, PyObject *args)
        else if (locals == Py_None)
                locals = globals;
 
+       if (globals == NULL || locals == NULL) {
+               PyErr_SetString(PyExc_TypeError, 
+                       "eval must be given globals and locals "
+                       "when called without a frame");
+               return NULL;
+       }
+
        if (PyDict_GetItemString(globals, "__builtins__") == NULL) {
                if (PyDict_SetItemString(globals, "__builtins__",
                                         PyEval_GetBuiltins()) != 0)