mirror of https://github.com/python/cpython
Issue #17899: Fix rare file descriptor leak in os.listdir().
(Done as separate patch from trunk as the code has diverged quite a bit.)
This commit is contained in:
parent
39668f57f4
commit
2e3e593e34
|
@ -12,6 +12,8 @@ What's New in Python 3.3.3 release candidate 1?
|
||||||
Core and Builtins
|
Core and Builtins
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
- Issue #17899: Fix rare file descriptor leak in os.listdir().
|
||||||
|
|
||||||
- Issue #18552: Check return value of PyArena_AddPyObject() in
|
- Issue #18552: Check return value of PyArena_AddPyObject() in
|
||||||
obj2ast_object().
|
obj2ast_object().
|
||||||
|
|
||||||
|
|
|
@ -3443,7 +3443,9 @@ posix_listdir(PyObject *self, PyObject *args, PyObject *kwargs)
|
||||||
path_t path;
|
path_t path;
|
||||||
PyObject *list = NULL;
|
PyObject *list = NULL;
|
||||||
static char *keywords[] = {"path", NULL};
|
static char *keywords[] = {"path", NULL};
|
||||||
|
#ifdef HAVE_FDOPENDIR
|
||||||
int fd = -1;
|
int fd = -1;
|
||||||
|
#endif /* HAVE_FDOPENDIR */
|
||||||
|
|
||||||
#if defined(MS_WINDOWS) && !defined(HAVE_OPENDIR)
|
#if defined(MS_WINDOWS) && !defined(HAVE_OPENDIR)
|
||||||
PyObject *v;
|
PyObject *v;
|
||||||
|
@ -3732,6 +3734,13 @@ exit:
|
||||||
|
|
||||||
if (dirp == NULL) {
|
if (dirp == NULL) {
|
||||||
list = path_error("listdir", &path);
|
list = path_error("listdir", &path);
|
||||||
|
#ifdef HAVE_FDOPENDIR
|
||||||
|
if (fd != -1) {
|
||||||
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
close(fd);
|
||||||
|
Py_END_ALLOW_THREADS
|
||||||
|
}
|
||||||
|
#endif /* HAVE_FDOPENDIR */
|
||||||
goto exit;
|
goto exit;
|
||||||
}
|
}
|
||||||
if ((list = PyList_New(0)) == NULL) {
|
if ((list = PyList_New(0)) == NULL) {
|
||||||
|
@ -3774,8 +3783,10 @@ exit:
|
||||||
exit:
|
exit:
|
||||||
if (dirp != NULL) {
|
if (dirp != NULL) {
|
||||||
Py_BEGIN_ALLOW_THREADS
|
Py_BEGIN_ALLOW_THREADS
|
||||||
|
#ifdef HAVE_FDOPENDIR
|
||||||
if (fd > -1)
|
if (fd > -1)
|
||||||
rewinddir(dirp);
|
rewinddir(dirp);
|
||||||
|
#endif /* HAVE_FDOPENDIR */
|
||||||
closedir(dirp);
|
closedir(dirp);
|
||||||
Py_END_ALLOW_THREADS
|
Py_END_ALLOW_THREADS
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue