From 356435acd2b75f9f3293067f0725fab58028f931 Mon Sep 17 00:00:00 2001
From: Hynek Schlawack <hs@ox.cx>
Date: Wed, 7 Nov 2012 09:02:24 +0100
Subject: [PATCH] Issue #15001: fix segfault on "del sys.module['__main__']"
Patch by Victor Stinner.
---
Lib/test/test_cmd_line.py | 12 ++++++++++++
Misc/NEWS | 3 +++
Python/pythonrun.c | 12 ++++++------
3 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/Lib/test/test_cmd_line.py b/Lib/test/test_cmd_line.py
index f463af46654..7d039ee00e6 100644
--- a/Lib/test/test_cmd_line.py
+++ b/Lib/test/test_cmd_line.py
@@ -364,6 +364,18 @@ class CmdLineTest(unittest.TestCase):
self.assertEqual(rc, 0)
self.assertIn(b'random is 1', out)
+ def test_del___main__(self):
+ # Issue #15001: PyRun_SimpleFileExFlags() did crash because it kept a
+ # borrowed reference to the dict of __main__ module and later modify
+ # the dict whereas the module was destroyed
+ filename = test.support.TESTFN
+ self.addCleanup(test.support.unlink, filename)
+ with open(filename, "w") as script:
+ print("import sys", file=script)
+ print("del sys.modules['__main__']", file=script)
+ assert_python_ok(filename)
+
+
def test_main():
test.support.run_unittest(CmdLineTest)
test.support.reap_children()
diff --git a/Misc/NEWS b/Misc/NEWS
index a7f05214b44..6901beccf55 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2.4
Core and Builtins
-----------------
+- Issue #15001: fix segfault on "del sys.module['__main__']". Patch by Victor
+ Stinner.
+
- Issue #5057: the peepholer no longer optimizes subscription on unicode
literals (e.g. u'foo'[0]) in order to produce compatible pyc files between
narrow and wide builds.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index cf4e34c33eb..3639fa7e226 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -1257,25 +1257,26 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
{
PyObject *m, *d, *v;
const char *ext;
- int set_file_name = 0, ret;
+ int set_file_name = 0, ret = -1;
size_t len;
m = PyImport_AddModule("__main__");
if (m == NULL)
return -1;
+ Py_INCREF(m);
d = PyModule_GetDict(m);
if (PyDict_GetItemString(d, "__file__") == NULL) {
PyObject *f;
f = PyUnicode_DecodeFSDefault(filename);
if (f == NULL)
- return -1;
+ goto done;
if (PyDict_SetItemString(d, "__file__", f) < 0) {
Py_DECREF(f);
- return -1;
+ goto done;
}
if (PyDict_SetItemString(d, "__cached__", Py_None) < 0) {
Py_DECREF(f);
- return -1;
+ goto done;
}
set_file_name = 1;
Py_DECREF(f);
@@ -1288,7 +1289,6 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
fclose(fp);
if ((fp = fopen(filename, "rb")) == NULL) {
fprintf(stderr, "python: Can't reopen .pyc file\n");
- ret = -1;
goto done;
}
/* Turn on optimization if a .pyo file is given */
@@ -1302,7 +1302,6 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
flush_io();
if (v == NULL) {
PyErr_Print();
- ret = -1;
goto done;
}
Py_DECREF(v);
@@ -1310,6 +1309,7 @@ PyRun_SimpleFileExFlags(FILE *fp, const char *filename, int closeit,
done:
if (set_file_name && PyDict_DelItemString(d, "__file__"))
PyErr_Clear();
+ Py_DECREF(m);
return ret;
}
--
2.30.9