nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-26 00:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

GC server: Clear O_NONBLOCK on the right file descriptor

Browse Source 
The bug fix in 6d30f9e6fe erroneously
cleared O_NONBLOCK on the server rather than client FD (leaving both
in an incorrect state).

Fixes #8551.

(cherry picked from commit a6a75ecad8)
This commit is contained in:
Eelco Dolstra 2023-06-20 11:19:14 +02:00
parent 25e1eb4dfd
commit 3cc2ff77da
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/libstore/gc.cc
View File

@ -564,7 +564,7 @@ void LocalStore::collectGarbage(const GCOptions & options, GCResults & results)
/* On macOS, accepted sockets inherit the /* On macOS, accepted sockets inherit the
non-blocking flag from the server socket, so non-blocking flag from the server socket, so
explicitly make it blocking. */ explicitly make it blocking. */
if (fcntl(fdServer.get(), F_SETFL, fcntl(fdServer.get(), F_GETFL) & ~O_NONBLOCK) == -1) if (fcntl(fdClient.get(), F_SETFL, fcntl(fdClient.get(), F_GETFL) & ~O_NONBLOCK) == -1)
abort(); abort();
while (true) { while (true) {