From: Ross Lagerwall <rosslagerwall@gmail.com>
Date: Sun, 18 Mar 2012 13:55:10 +0000 (+0200)
Subject: Issue 14359: Only use O_CLOEXEC in _posixmodule.c if it is defined.
X-Git-Tag: v3.3.0a2~114
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5802fdf31f80c5ba5f6eec149b418cf83e9c5f33;p=python

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

Based on patch from Hervé Coatanhay.
---

diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c
index babf039611..8d3af6e877 100644
--- a/Modules/_posixsubprocess.c
+++ b/Modules/_posixsubprocess.c
@@ -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);