mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-07-23 11:15:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merged revisions 72273 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r72273 | hirokazu.yamamoto | 2009-05-04 14:28:39 +0900 | 1 line

  Issue #5913: os.listdir() should fail for empty path on windows.
........
This commit is contained in:
Hirokazu Yamamoto 2009-05-04 05:56:46 +00:00
parent 73e8e5f1c7
commit bbb9be7211
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Modules/posixmodule.c
View file

@ -2183,7 +2183,6 @@ posix_listdir(PyObject *self, PyObject *args)
if (PyArg_ParseTuple(args, "U:listdir", &po)) {
WIN32_FIND_DATAW wFileData;
Py_UNICODE *wnamebuf;
Py_UNICODE wch;
/* Overallocate for \\*.*\0 */
len = PyUnicode_GET_SIZE(po);
wnamebuf = malloc((len + 5) * sizeof(wchar_t));
@ -2192,10 +2191,12 @@ posix_listdir(PyObject *self, PyObject *args)
return NULL;
}
wcscpy(wnamebuf, PyUnicode_AS_UNICODE(po));
wch = len > 0 ? wnamebuf[len-1] : '\0';
if (wch != L'/' && wch != L'\\' && wch != L':')
wnamebuf[len++] = L'\\';
wcscpy(wnamebuf + len, L"*.*");
if (len > 0) {
Py_UNICODE wch = wnamebuf[len-1];
if (wch != L'/' && wch != L'\\' && wch != L':')
wnamebuf[len++] = L'\\';
wcscpy(wnamebuf + len, L"*.*");
}
if ((d = PyList_New(0)) == NULL) {
free(wnamebuf);
return NULL;
@ -2266,8 +2267,8 @@ posix_listdir(PyObject *self, PyObject *args)
char ch = namebuf[len-1];
if (ch != SEP && ch != ALTSEP && ch != ':')
namebuf[len++] = '/';
strcpy(namebuf + len, "*.*");
}
strcpy(namebuf + len, "*.*");
if ((d = PyList_New(0)) == NULL)
return NULL;