Fix memory leak in path_converter()

vstinner · vstinner · commit 26c03bd7d589 · 2016-09-19T11:55:44.000+02:00
Issue #28200: Replace PyUnicode_AsWideCharString() with PyUnicode_AsUnicodeAndSize().
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -29,6 +29,9 @@ Core and Builtins
 Library
 -------
 
+- Issue #28200: Fix memory leak on Windows in the os module (fix
+  path_converter() function).
+
 - Issue #25400: RobotFileParser now correctly returns default values for
   crawl_delay and request_rate.  Initial patch by Peter Wirtz.
 
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
@@ -920,7 +920,7 @@ path_converter(PyObject *o, void *p)
 
     if (is_unicode) {
 #ifdef MS_WINDOWS
-        wide = PyUnicode_AsWideCharString(o, &length);
+        wide = PyUnicode_AsUnicodeAndSize(o, &length);
         if (!wide) {
             goto exit;
         }

Original file line number	Diff line number	Diff line change
`@@ -920,7 +920,7 @@ path_converter(PyObject o, void p)`
`920`	`920`
`921`	`921`	`if (is_unicode) {`
`922`	`922`	`#ifdef MS_WINDOWS`
`923`		`- wide = PyUnicode_AsWideCharString(o, &length);`
	`923`	`+ wide = PyUnicode_AsUnicodeAndSize(o, &length);`
`924`	`924`	`if (!wide) {`
`925`	`925`	`goto exit;`
`926`	`926`	`}`