From ed53782ed56df61a6437ee8c5c548d7955e85551 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Sun, 13 Dec 2015 21:40:26 +0100 Subject: [PATCH] Issue #25846: Fix usage of Py_ARRAY_LENGTH() in win32_wchdir() --- Modules/posixmodule.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 854a7491c5f..c25d535b804 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -1345,13 +1345,13 @@ win32_chdir(LPCSTR path) static BOOL __stdcall win32_wchdir(LPCWSTR path) { - wchar_t _new_path[MAX_PATH], *new_path = _new_path; + wchar_t path_buf[MAX_PATH], *new_path = path_buf; int result; wchar_t env[4] = L"=x:"; if(!SetCurrentDirectoryW(path)) return FALSE; - result = GetCurrentDirectoryW(Py_ARRAY_LENGTH(new_path), new_path); + result = GetCurrentDirectoryW(Py_ARRAY_LENGTH(path_buf), new_path); if (!result) return FALSE; if (result > Py_ARRAY_LENGTH(new_path)) { @@ -1372,7 +1372,7 @@ win32_wchdir(LPCWSTR path) return TRUE; env[1] = new_path[0]; result = SetEnvironmentVariableW(env, new_path); - if (new_path != _new_path) + if (new_path != path_buf) PyMem_RawFree(new_path); return result; }