Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Issue #5913: os.listdir() should fail for empty path on windows.

This commit is contained in:
Hirokazu Yamamoto 2009-05-04 05:28:39 +00:00
parent eeb51a99c5
commit 406d7aaee7
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Misc/NEWS
View File

@ -266,6 +266,8 @@ Core and Builtins
Library
-------
- Issue #5913: os.listdir() should fail for empty path on windows.
- Issue #5084: unpickling now interns the attribute names of pickled objects,
saving memory and avoiding growth in size of subsequent pickles. Proposal
and original patch by Jake McGuire.

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;