[Python-checkins] cpython (merge 3.6 -> default): Merge 3.6

Mon Sep 19 05:56:22 EDT 2016

https://hg.python.org/cpython/rev/4cfb35dca5e8
changeset: 103957:4cfb35dca5e8
parent: 103955:316c7c02b63e
parent: 103956:6232e610e310
user: Victor Stinner <victor.stinner at gmail.com>
date: Mon Sep 19 11:56:06 2016 +0200
summary:
 Merge 3.6
files:
 Misc/NEWS | 3 +++
 Modules/posixmodule.c | 2 +-
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -35,6 +35,9 @@
 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
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -920,7 +920,7 @@
 
 if (is_unicode) {
 #ifdef MS_WINDOWS
- wide = PyUnicode_AsWideCharString(o, &length);
+ wide = PyUnicode_AsUnicodeAndSize(o, &length);
 if (!wide) {
 goto exit;
 }
-- 
Repository URL: https://hg.python.org/cpython
