]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-106118: Add O_CLOEXEC preprocessor guard (#106120)
authorErlend E. Aasland <erlend@python.org>
Wed, 28 Jun 2023 11:11:32 +0000 (13:11 +0200)
committerGitHub <noreply@github.com>
Wed, 28 Jun 2023 11:11:32 +0000 (13:11 +0200)
Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst [new file with mode: 0644]
Python/sysmodule.c

diff --git a/Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst b/Misc/NEWS.d/next/Build/2023-06-26-21-56-29.gh-issue-106118.0cCfhl.rst
new file mode 100644 (file)
index 0000000..f93cae5
--- /dev/null
@@ -0,0 +1,2 @@
+Fix compilation for platforms without :data:`!O_CLOEXEC`. The issue was
+introduced with Python 3.12b1 in :gh:`103295`. Patch by Erlend Aasland.
index 3284e14e7742db5e49c9c6693adc9786ceafe972..0cd8974d19713394f774399abb6b8d9fe25f3b65 100644 (file)
@@ -2277,7 +2277,10 @@ PyAPI_FUNC(int) PyUnstable_PerfMapState_Init(void) {
     char filename[100];
     pid_t pid = getpid();
     // Use nofollow flag to prevent symlink attacks.
-    int flags = O_WRONLY | O_CREAT | O_APPEND | O_NOFOLLOW | O_CLOEXEC;
+    int flags = O_WRONLY | O_CREAT | O_APPEND | O_NOFOLLOW;
+#ifdef O_CLOEXEC
+    flags |= O_CLOEXEC;
+#endif
     snprintf(filename, sizeof(filename) - 1, "/tmp/perf-%jd.map",
                 (intmax_t)pid);
     int fd = open(filename, flags, 0600);