summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntoine Pitrou <solipsis@pitrou.net>2010-11-20 19:50:57 (GMT)
committerAntoine Pitrou <solipsis@pitrou.net>2010-11-20 19:50:57 (GMT)
commit5a96b5241f8ff0badd0f2a95305d551e80847f1c (patch)
treed03c7ab8112769a93108d04b7c0e9e7f5b2ba3da
parente7606649b3f285c3491a03eb8329ebd44fc8ad0f (diff)
downloadcpython-5a96b5241f8ff0badd0f2a95305d551e80847f1c.zip
cpython-5a96b5241f8ff0badd0f2a95305d551e80847f1c.tar.gz
cpython-5a96b5241f8ff0badd0f2a95305d551e80847f1c.tar.bz2
Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil
Schemenauer.
-rw-r--r--Misc/NEWS3
-rw-r--r--Python/pythonrun.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/Misc/NEWS b/Misc/NEWS
index 663b226..43afccd 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,9 @@ What's New in Python 3.2 Beta 1?
Core and Builtins
-----------------
+- Issue #10255: Fix reference leak in Py_InitializeEx(). Patch by Neil
+ Schemenauer.
+
- Issue #4925: Add filename to error message when executable can't be found in
subprocess.
diff --git a/Python/pythonrun.c b/Python/pythonrun.c
index 784558c..37c1f11 100644
--- a/Python/pythonrun.c
+++ b/Python/pythonrun.c
@@ -893,8 +893,10 @@ initstdio(void)
/* Set builtins.open */
if (PyObject_SetAttrString(bimod, "open", wrapper) == -1) {
+ Py_DECREF(wrapper);
goto error;
}
+ Py_DECREF(wrapper);
encoding = Py_GETENV("PYTHONIOENCODING");
errors = NULL;