gh-111132: Fix crash on interactive_filename in run_mod (#111136)

sobolevn · web-flow · commit 124259f9b30f · 2023-10-20T21:31:26.000+01:00
diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
@@ -684,6 +684,17 @@ def test_syntaxerror_null_bytes_in_multiline_string(self):
                     ]
                 )
 
+    def test_syntaxerror_does_not_crash(self):
+        script = "nonlocal x\n"
+        with os_helper.temp_dir() as script_dir:
+            script_name = _make_test_script(script_dir, 'script', script)
+            exitcode, stdout, stderr = assert_python_failure(script_name)
+            text = io.TextIOWrapper(io.BytesIO(stderr), 'ascii').read()
+            # It used to crash in https://github.com/python/cpython/issues/111132
+            self.assertTrue(text.endswith(
+                'SyntaxError: nonlocal declaration not allowed at module level\n',
+            ), text)
+
     def test_consistent_sys_path_for_direct_execution(self):
         # This test case ensures that the following all give the same
         # sys.path configuration:
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
@@ -1277,7 +1277,9 @@ run_mod(mod_ty mod, PyObject *filename, PyObject *globals, PyObject *locals,
 
     PyCodeObject *co = _PyAST_Compile(mod, interactive_filename, flags, -1, arena);
     if (co == NULL) {
-        Py_DECREF(interactive_filename);
+        if (interactive_src) {
+            Py_DECREF(interactive_filename);
+        }
         return NULL;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1277,7 +1277,9 @@ run_mod(mod_ty mod, PyObject filename, PyObject globals, PyObject *locals,`
`1277`	`1277`
`1278`	`1278`	`PyCodeObject *co = _PyAST_Compile(mod, interactive_filename, flags, -1, arena);`
`1279`	`1279`	`if (co == NULL) {`
`1280`		`- Py_DECREF(interactive_filename);`
	`1280`	`+ if (interactive_src) {`
	`1281`	`+ Py_DECREF(interactive_filename);`
	`1282`	`+ }`
`1281`	`1283`	`return NULL;`
`1282`	`1284`	`}`
`1283`	`1285`