* 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.

3 files changed, 9 insertions, 5 deletions

diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 7009876f1bcd..5c8b31cf6a6b 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -685,8 +685,8 @@ DerivationGoal::~DerivationGoal()
     try {
         killChild();
         deleteTmpDir(false);
-    } catch (Error & e) {
-        printMsg(lvlError, format("error (ignored): %1%") % e.msg());
+    } catch (...) {
+        ignoreException();
     }
 }
 
diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc
index 7b7efc84b3d1..cd8bc1a3394f 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();
+    }
 }
 
 
diff --git a/src/libstore/remote-store.cc b/src/libstore/remote-store.cc
index 1aab90d38c52..449a4c448f0f 100644
--- a/src/libstore/remote-store.cc
+++ b/src/libstore/remote-store.cc
@@ -148,8 +148,8 @@ RemoteStore::~RemoteStore()
         fdSocket.close();
         if (child != -1)
             child.wait(true);
-    } catch (Error & e) {
-        printMsg(lvlError, format("error (ignored): %1%") % e.msg());
+    } catch (...) {
+        ignoreException();
     }
 }