* Set a terminate() handler to ensure that we leave the BDB

  environment cleanly even when an exception is thrown from a
  destructor.  We still crash, but we don't take all other Nix
  processes with us.

1 files changed, 5 insertions, 1 deletions

diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 7b7efc84b3..cd8bc1a339 100644
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -161,7 +161,11 @@ LocalStore::LocalStore(bool reserveSpace)
 LocalStore::~LocalStore()
 {
     /* If the database isn't open, this is a NOP. */
-    nixDB.close();
+    try {
+        nixDB.close();
+    } catch (...) {
+        ignoreException();
+    }
 }