Merge 3.5

This commit is contained in:
Victor Stinner 2015-12-14 00:22:10 +01:00
commit 9fdaff30db

View file

@ -1354,7 +1354,7 @@ win32_wchdir(LPCWSTR path)
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);