mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-22 17:55:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 15

_Py_wgetcwd() decodes the path using _Py_char2wchar() to support surrogates

Browse source
This commit is contained in:
Victor Stinner 2010-10-14 12:37:19 +00:00
parent 22a351aabf
commit f4061dac60
2 changed files with 17 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Python/fileutils.c
View file

@ -364,7 +364,8 @@ _Py_wrealpath(const wchar_t *path,
}
#endif
/* Get the current directory. Decode the path from the locale encoding. */
/* Get the current directory. size is the buffer size in wide characters
including the null character. Decode the path from the locale encoding. */
wchar_t*
_Py_wgetcwd(wchar_t *buf, size_t size)
@ -373,12 +374,19 @@ _Py_wgetcwd(wchar_t *buf, size_t size)
return _wgetcwd(buf, size);
#else
char fname[PATH_MAX];
wchar_t *wname;
if (getcwd(fname, PATH_MAX) == NULL)
return NULL;
if (mbstowcs(buf, fname, size) >= size) {
errno = ERANGE;
wname = _Py_char2wchar(fname);
if (wname == NULL)
return NULL;
if (size <= wcslen(wname)) {
PyMem_Free(wname);
return NULL;
}
wcsncpy(buf, wname, size);
PyMem_Free(wname);
return buf;
#endif
}