gh-130070: Fix exec(<string>, closure=<non-None>) unexpected path (#130071)

bswck · sobolevn · web-flow · commit 954b2cf031fb · 2025-04-17T10:14:55.000+03:00
Fixed an assertion error (so, it could be reproduced only in builds with assertions enabled)
for `exec` when the `source` argument is a string and the `closure` argument is not `None`.

Co-authored-by: sobolevn &lt;mail@sobolevn.me&gt;
diff --git a/Lib/test/test_builtin.py b/Lib/test/test_builtin.py
@@ -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,
diff --git a/Misc/NEWS.d/next/Core_and_Builtins/2025-02-13-05-09-31.gh-issue-130070.C8c9gK.rst b/Misc/NEWS.d/next/Core_and_Builtins/2025-02-13-05-09-31.gh-issue-130070.C8c9gK.rst
@@ -0,0 +1 @@
+Fixed an assertion error for :func:`exec` passed a string ``source`` and a non-``None`` ``closure``. Patch by Bartosz Sławecki.
diff --git a/Python/bltinmodule.c b/Python/bltinmodule.c
@@ -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;`