diff options
| author | Georg Brandl <georg@python.org> | 2008-07-16 21:31:41 +0000 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2008-07-16 21:31:41 +0000 |
| commit | 3065b4efd9b806f4fe40b9610b77c7112e7953f8 (patch) | |
| tree | 5017a5815e04d47c747e19fb2ec78665d6f4f7b8 /Modules | |
| parent | 66eb5a16de4651980ccaad8e568af417d6f8b109 (diff) | |
| download | cpython-3065b4efd9b806f4fe40b9610b77c7112e7953f8.tar.gz | |
#1608818: errno can get set by every call to readdir().
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/posixmodule.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index d8c81b6a58..6af6e513d5 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -2322,11 +2322,19 @@ posix_listdir(PyObject *self, PyObject *args) return NULL; } for (;;) { + errno = 0; Py_BEGIN_ALLOW_THREADS ep = readdir(dirp); Py_END_ALLOW_THREADS - if (ep == NULL) - break; + if (ep == NULL) { + if (errno == 0) { + break; + } else { + closedir(dirp); + Py_DECREF(d); + return posix_error_with_allocated_filename(name); + } + } if (ep->d_name[0] == '.' && (NAMLEN(ep) == 1 || (ep->d_name[1] == '.' && NAMLEN(ep) == 2))) @@ -2363,12 +2371,6 @@ posix_listdir(PyObject *self, PyObject *args) } Py_DECREF(v); } - if (errno != 0 && d != NULL) { - /* readdir() returned NULL and set errno */ - closedir(dirp); - Py_DECREF(d); - return posix_error_with_allocated_filename(name); - } closedir(dirp); PyMem_Free(name); |