summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2012-09-12 16:01:36 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2012-09-12 16:01:36 (GMT)
commitfd296ff5d6436ad3a782cca816783f05acd9fe78 (patch)
tree6f1499a954f514134cfe75ce836a90a34f0cd403
parent1aca31e8f329e19de62a2f1a2080995e5712a9cd (diff)
downloadcpython-fd296ff5d6436ad3a782cca816783f05acd9fe78.zip
cpython-fd296ff5d6436ad3a782cca816783f05acd9fe78.tar.gz
cpython-fd296ff5d6436ad3a782cca816783f05acd9fe78.tar.bz2
Issue #15926: Fix crash after multiple reinitializations of the interpreter.
-rw-r--r--Misc/NEWS2
-rw-r--r--Modules/posixmodule.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 0594152..882d274 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.3.0 Release Candidate 3?
Core and Builtins
-----------------
+- Issue #15926: Fix crash after multiple reinitializations of the interpreter.
+
- Issue #15895: Fix FILE pointer leak in one error branch of
PyRun_SimpleFileExFlags() when filename points to a pyc/pyo file, closeit
is false an and set_main_loader() fails.
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 1f2b0cc..54f6cd2 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -11852,7 +11852,6 @@ INITFUNC(void)
/* initialize TerminalSize_info */
PyStructSequence_InitType(&TerminalSizeType, &TerminalSize_desc);
- Py_INCREF(&TerminalSizeType);
}
#if defined(HAVE_WAITID) && !defined(__APPLE__)
Py_INCREF((PyObject*) &WaitidResultType);
@@ -11915,6 +11914,7 @@ INITFUNC(void)
#endif /* __APPLE__ */
+ Py_INCREF(&TerminalSizeType);
PyModule_AddObject(m, "terminal_size", (PyObject*) &TerminalSizeType);
billion = PyLong_FromLong(1000000000);