From: Nikita Sobolev <mail@sobolevn.me>
Date: Fri, 20 Oct 2023 20:31:26 +0000 (+0300)
Subject: gh-111132: Fix crash on interactive_filename in `run_mod` (#111136)
X-Git-Tag: v3.13.0a2~382
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=124259f9b30f6cbab4dd2bcfb0d32f1cddcc35db;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Lib/test/test_cmd_line_script.py b/Lib/test/test_cmd_line_script.py
index 614c6b3c3b52..e9405ff8b214 100644
--- a/Lib/test/test_cmd_line_script.py
+++ b/Lib/test/test_cmd_line_script.py
@@ -684,6 +684,17 @@ class CmdLineTest(unittest.TestCase):
                     ]
                 )
 
+    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
index b915c063d0b4..db4991662b8b 100644
--- 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;
     }