NixOS/nix
NixOS/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2024-10-18 00:16:11 -04:00
Code Activity

fix: Ignore Interrupted in recursive-nix daemon worker

Browse source 
Otherwise, if checkInterrupt() in any of the supported store operations
would catch onto a user interrupt, the exception would bubble to the thread
start and be handled by std::terminate(): a crash.
This commit is contained in:
Robert Hensing 2024-10-10 12:31:34 +02:00
parent de0a34a362
commit 0e5a5303ad
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libstore/unix/build/local-derivation-goal.cc
View file

@ -65,6 +65,7 @@
#include <iostream> #include <iostream>
#include "strings.hh" #include "strings.hh"
#include "signals.hh"
namespace nix { namespace nix {
@ -1579,6 +1580,8 @@ void LocalDerivationGoal::startDaemon()
FdSink(remote.get()), FdSink(remote.get()),
NotTrusted, daemon::Recursive); NotTrusted, daemon::Recursive);
debug("terminated daemon connection"); debug("terminated daemon connection");
} catch (const Interrupted &) {
debug("interrupted daemon connection");
} catch (SystemError &) { } catch (SystemError &) {
ignoreExceptionExceptInterrupt(); ignoreExceptionExceptInterrupt();
} }