From cbfac2fdccc83b04d9c2027e9e21070d4ac7c7e5 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 1 May 2007 15:16:17 +0000 Subject: * 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. --- src/libutil/util.cc | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'src/libutil/util.cc') diff --git a/src/libutil/util.cc b/src/libutil/util.cc index ae5af249203e..d61b35bdfbe0 100644 --- a/src/libutil/util.cc +++ b/src/libutil/util.cc @@ -444,7 +444,11 @@ void warnOnce(bool & haveWarned, const format & f) static void defaultWriteToStderr(const unsigned char * buf, size_t count) { - writeFull(STDERR_FILENO, buf, count); + try { + writeFull(STDERR_FILENO, buf, count); + } catch (SysError & e) { + /* ignore EPIPE etc. */ + } } @@ -545,8 +549,8 @@ AutoCloseFD::~AutoCloseFD() { try { close(); - } catch (Error & e) { - printMsg(lvlError, format("error (ignored): %1%") % e.msg()); + } catch (...) { + ignoreException(); } } @@ -968,5 +972,15 @@ bool string2Int(const string & s, int & n) return str && str.get() == EOF; } + +void ignoreException() +{ + try { + throw; + } catch (std::exception & e) { + printMsg(lvlError, format("error (ignored): %1%") % e.what()); + } +} + } -- cgit 1.4.1