[Python-checkins] cpython (merge 3.3 -> default): Merge.
richard.oudkerk
python-checkins at python.org
Mon Jun 10 16:46:59 CEST 2013
http://hg.python.org/cpython/rev/df79692a1e7e
changeset: 84079:df79692a1e7e
parent: 84077:6860263c05b3
parent: 84078:ec854f76d6b9
user: Richard Oudkerk <shibturn at gmail.com>
date: Mon Jun 10 15:45:30 2013 +0100
summary:
Merge.
files:
Misc/NEWS | 2 ++
Python/dynload_win.c | 5 +++--
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -10,6 +10,8 @@
Core and Builtins
-----------------
+- Issue #18180: Fix ref leak in _PyImport_GetDynLoadWindows().
+
- Issue #18038: SyntaxError raised during compilation sources with illegal
encoding now always contains an encoding name.
diff --git a/Python/dynload_win.c b/Python/dynload_win.c
--- a/Python/dynload_win.c
+++ b/Python/dynload_win.c
@@ -262,8 +262,9 @@
theLength));
}
if (message != NULL) {
- PyErr_SetImportError(message, PyUnicode_FromString(shortname),
- pathname);
+ PyObject *shortname_obj = PyUnicode_FromString(shortname);
+ PyErr_SetImportError(message, shortname_obj, pathname);
+ Py_XDECREF(shortname_obj);
Py_DECREF(message);
}
return NULL;
--
Repository URL: http://hg.python.org/cpython
More information about the Python-checkins
mailing list