diff options
| -rw-r--r-- | src/libmain/shared.cc | 3 | ||||
| -rw-r--r-- | src/nix-daemon/nix-daemon.cc | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index ee0dccc9d11d..b71bca682baa 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -303,6 +303,9 @@ int main(int argc, char * * argv) if (e.prefix() != "" && !showTrace) printMsg(lvlError, "(use `--show-trace' to show detailed location information)"); return e.status; + } catch (std::bad_alloc & e) { + printMsg(lvlError, "error: out of memory"); + return 1; } catch (std::exception & e) { printMsg(lvlError, format("error: %1%") % e.what()); return 1; diff --git a/src/nix-daemon/nix-daemon.cc b/src/nix-daemon/nix-daemon.cc index 19b72f7eae45..58ef2109b313 100644 --- a/src/nix-daemon/nix-daemon.cc +++ b/src/nix-daemon/nix-daemon.cc @@ -731,6 +731,10 @@ static void processConnection(bool trusted) if (!errorAllowed) printMsg(lvlError, format("error processing client input: %1%") % e.msg()); stopWork(false, e.msg(), GET_PROTOCOL_MINOR(clientVersion) >= 8 ? e.status : 0); if (!errorAllowed) break; + } catch (std::bad_alloc & e) { + if (canSendStderr) + stopWork(false, "Nix daemon out of memory", GET_PROTOCOL_MINOR(clientVersion) >= 8 ? 1 : 0); + throw; } to.flush(); @@ -893,7 +897,7 @@ static void daemonLoop() processConnection(trusted); } catch (std::exception & e) { - writeToStderr("child error: " + string(e.what()) + "\n"); + writeToStderr("unexpected Nix daemon error: " + string(e.what()) + "\n"); } exit(0); } |