Commitaa40f92

authored and

committed

[2.7] bpo-32903: Fix a memory leak in os.chdir() on Windows (pythonGH-5801). (python#5947)

(cherry picked from commit3e197c7)Co-authored-by: Alexey Izbyshev <izbyshev@users.noreply.github.com>

1 parentc20c97f commitaa40f92Copy full SHA for aa40f92

File tree

+10

-7

lines changed

+10

-7

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+Fix a memory leak in os.chdir() on Windows if the current directory is set`
	`2`	`+to a UNC path.`

Lines changed: 8 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -984,6 +984,7 @@ win32_wchdir(LPCWSTR path)`
`984`	`984`	`wchar_t_new_path[MAX_PATH+1],*new_path=_new_path;`
`985`	`985`	`intresult;`
`986`	`986`	`wchar_tenv[4]=L"=x:";`
	`987`	`+intis_unc_like_path;`
`987`	`988`
`988`	`989`	`if(!SetCurrentDirectoryW(path))`
`989`	`990`	`return FALSE;`
`@@ -1002,15 +1003,15 @@ win32_wchdir(LPCWSTR path)`
`1002`	`1003`	`return FALSE;`
`1003`	`1004`	`}`
`1004`	`1005`	`}`
`1005`		`-if (wcsncmp(new_path,L"\\\\",2)==0\|\|`
`1006`		`-wcsncmp(new_path,L"//",2)==0)`
`1007`		`-/* UNC path, nothing to do. */`
`1008`		`-return TRUE;`
`1009`		`-env[1]=new_path[0];`
`1010`		`-result=SetEnvironmentVariableW(env,new_path);`
	`1006`	`+is_unc_like_path= (wcsncmp(new_path,L"\\\\",2)==0\|\|`
	`1007`	`+wcsncmp(new_path,L"//",2)==0);`
	`1008`	`+if (!is_unc_like_path) {`
	`1009`	`+env[1]=new_path[0];`
	`1010`	`+result=SetEnvironmentVariableW(env,new_path);`
	`1011`	`+}`
`1011`	`1012`	`if (new_path!=_new_path)`
`1012`	`1013`	`free(new_path);`
`1013`		`-returnresult;`
	`1014`	`+returnresult ? TRUE : FALSE;`
`1014`	`1015`	`}`
`1015`	`1016`	`#endif`
`1016`	`1017`

Comments

(0)