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

[victor.stinner]

https://hg.python.org/cpython/rev/314eeb71b161
changeset:   99560:314eeb71b161
parent:      99558:35650db28afe
parent:      99559:aba6caf7b9f0
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Mon Dec 14 00:22:10 2015 +0100
summary:
  Merge 3.5

files:
  Modules/posixmodule.c |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -1354,7 +1354,7 @@
     result = GetCurrentDirectoryW(Py_ARRAY_LENGTH(path_buf), new_path);
     if (!result)
         return FALSE;
-    if (result > Py_ARRAY_LENGTH(new_path)) {
+    if (result > Py_ARRAY_LENGTH(path_buf)) {
         new_path = PyMem_RawMalloc(result * sizeof(wchar_t));
         if (!new_path) {
             SetLastError(ERROR_OUTOFMEMORY);

-- 
Repository URL: https://hg.python.org/cpython