1berry/cpython
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Issue 14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.

Browse Source 
Based on patch from Hervé Coatanhay.
This commit is contained in:
Ross Lagerwall 2012-03-18 15:55:10 +02:00
parent 7dabfede34
commit 5802fdf31f
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/_posixsubprocess.c
View File

@ -204,7 +204,18 @@ _close_open_fd_range_safe(int start_fd, int end_fd, PyObject* py_fds_to_keep)
int fd_dir_fd;
if (start_fd >= end_fd)
return;
fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
#ifdef O_CLOEXEC
fd_dir_fd = open(FD_DIR, O_RDONLY | O_CLOEXEC, 0);
#else
fd_dir_fd = open(FD_DIR, O_RDONLY, 0);
#ifdef FD_CLOEXEC
{
int old = fcntl(fd_dir_fd, F_GETFD);
if (old != -1)
fcntl(fd_dir_fd, F_SETFD, old | FD_CLOEXEC);
}
#endif
#endif
if (fd_dir_fd == -1) {
/* No way to get a list of open fds. */
_close_fds_by_brute_force(start_fd, end_fd, py_fds_to_keep);