summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2024-06-06 12:31:29 (GMT)
committerBrad King <brad.king@kitware.com>2024-06-06 12:31:29 (GMT)
commit20d1f96dac916032a309244f8e1d79d26ed008ab (patch)
tree5f84fd19fb76b5334868ccbbc820ea3f1701f268
parentefaa9efece0786a80243d005e35e68f18999eb0e (diff)
parentff077af0320611abf024d2c4d05baecb71de705c (diff)
downloadCMake-20d1f96dac916032a309244f8e1d79d26ed008ab.zip
CMake-20d1f96dac916032a309244f8e1d79d26ed008ab.tar.gz
CMake-20d1f96dac916032a309244f8e1d79d26ed008ab.tar.bz2
Merge topic 'ctest-jobserver-fifo-hang' into release-3.29
ff077af032 ctest: Set close-on-exec for jobserver FIFO Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !9580
-rw-r--r--Source/CTest/cmUVJobServerClient.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/Source/CTest/cmUVJobServerClient.cxx b/Source/CTest/cmUVJobServerClient.cxx
index d7d76c9..055b29b 100644
--- a/Source/CTest/cmUVJobServerClient.cxx
+++ b/Source/CTest/cmUVJobServerClient.cxx
@@ -306,6 +306,10 @@ void ImplPosix::ConnectFIFO(const char* path)
if (fd < 0) {
return;
}
+ if (fcntl(fd, F_SETFD, FD_CLOEXEC) == -1) {
+ close(fd);
+ return;
+ }
cm::uv_pipe_ptr connFIFO;
connFIFO.init(this->Loop, 0, this);