@@ -1061,8 +1061,24 @@ def four_freevars():
             three_freevars.__code__,
             three_freevars.__globals__,
             closure=my_closure)
+        my_closure = tuple(my_closure)
+
+        # should fail: anything passed to closure= isn't allowed
+        # when the source is a string
+        self.assertRaises(TypeError,
+            exec,
+            "pass",
+            closure=int)
+
+        # should fail: correct closure= argument isn't allowed
+        # when the source is a string
+        self.assertRaises(TypeError,
+            exec,
+            "pass",
+            closure=my_closure)
 
         # should fail: closure tuple with one non-cell-var
+        my_closure = list(my_closure)
         my_closure[0] = int
         my_closure = tuple(my_closure)
         self.assertRaises(TypeError,
 
@@ -0,0 +1 @@
+Fixed an assertion error for :func:`exec` passed a string ``source`` and a non-``None`` ``closure``. Patch by Bartosz Sławecki.
@@ -1169,6 +1169,7 @@ builtin_exec_impl(PyObject *module, PyObject *source, PyObject *globals,
         if (closure != NULL) {
             PyErr_SetString(PyExc_TypeError,
                 "closure can only be used when source is a code object");
+            goto error;
         }
         PyObject *source_copy;
         const char *str;
Original file line number	Diff line number	Diff line change
@@ -0,0 +1 @@
	1	+ Fixed an assertion error for :func:`exec` passed a string ``source`` and a non-``None`` ``closure``. Patch by Bartosz Sławecki.
Original file line number	Diff line number	Diff line change
@@ -1169,6 +1169,7 @@ builtin_exec_impl(PyObject module, PyObject source, PyObject *globals,
1169	1169	if (closure != NULL) {
1170	1170	PyErr_SetString(PyExc_TypeError,
1171	1171	"closure can only be used when source is a code object");
	1172	+ goto error;
1172	1173	}
1173	1174	PyObject *source_copy;
1174	1175	const char *str;