Use check_but_allow_none for exec/eval.

cthulahoops · cthulahoops · commit 6548c365cb7a · 2019-03-04T14:32:52.000Z
diff --git a/tests/snippets/test_exec.py b/tests/snippets/test_exec.py
@@ -10,3 +10,12 @@
 exec("assert 4 == x", {'x': 2}, {'x': 4})
 
 exec("assert max(1, 2) == 2", {}, {})
+
+exec("max(1, 5, square(5)) == 25", None)
+
+try:
+    exec("", 1)
+except TypeError:
+    pass
+else:
+    raise TypeError("exec should fail unless globals is a dict or None")
diff --git a/vm/src/builtins.rs b/vm/src/builtins.rs
@@ -190,12 +190,11 @@ fn builtin_eval(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         vm,
         args,
         required = [(source, None)],
-        optional = [
-            (globals, Some(vm.ctx.dict_type())),
-            (locals, Some(vm.ctx.dict_type()))
-        ]
+        optional = [(globals, None), (locals, Some(vm.ctx.dict_type()))]
     );
 
+    check_but_allow_none!(vm, globals, vm.ctx.dict_type());
+
     // Determine code object:
     let code_obj = if objtype::isinstance(source, &vm.ctx.code_type()) {
         source.clone()
@@ -227,12 +226,11 @@ fn builtin_exec(vm: &mut VirtualMachine, args: PyFuncArgs) -> PyResult {
         vm,
         args,
         required = [(source, None)],
-        optional = [
-            (globals, Some(vm.ctx.dict_type())),
-            (locals, Some(vm.ctx.dict_type()))
-        ]
+        optional = [(globals, None), (locals, Some(vm.ctx.dict_type()))]
     );
 
+    check_but_allow_none!(vm, globals, vm.ctx.dict_type());
+
     // Determine code object:
     let code_obj = if objtype::isinstance(source, &vm.ctx.str_type()) {
         let mode = compile::Mode::Exec;
