languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 09:01:41 +00:00
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-19 06:08:43 +02:00
parent 1623afff67
commit 71faefc37e
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Misc/ACKS
View file

@ -173,6 +173,7 @@ Mike Clarkson
Andrew Clegg
Brad Clements
Steve Clift
Hervé Coatanhay
Nick Coghlan
Josh Cogliati
Dave Cole

6
Misc/NEWS
View file

@ -78,6 +78,12 @@ Extension Modules
- Issue #14212: The re module didn't retain a reference to buffers it was
scanning, resulting in segfaults.
Build
-----
- Issue #14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.
Based on patch from Hervé Coatanhay.
What's New in Python 3.2.3 release candidate 2?
===============================================

13
Modules/_posixsubprocess.c
View file

@ -202,7 +202,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);