Merge.

shibturn · shibturn · commit cac17b4d78fd · 2013-06-10T15:45:30.000+01:00
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -10,6 +10,8 @@ What's New in Python 3.4.0 Alpha 1?
 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
@@ -262,8 +262,9 @@ dl_funcptr _PyImport_GetDynLoadWindows(const char *shortname,
                         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;

Original file line number	Diff line number	Diff line change
`@@ -262,8 +262,9 @@ dl_funcptr _PyImport_GetDynLoadWindows(const char *shortname,`
`262`	`262`	`theLength));`
`263`	`263`	`}`
`264`	`264`	`if (message != NULL) {`
`265`		`- PyErr_SetImportError(message, PyUnicode_FromString(shortname),`
`266`		`- pathname);`
	`265`	`+ PyObject *shortname_obj = PyUnicode_FromString(shortname);`
	`266`	`+ PyErr_SetImportError(message, shortname_obj, pathname);`
	`267`	`+ Py_XDECREF(shortname_obj);`
`267`	`268`	`Py_DECREF(message);`
`268`	`269`	`}`
`269`	`270`	`return NULL;`