Make sure destructors don't throw

Change-Id: Ia4d3d2fa715708f04fded238305543640e78424a

diff --git a/src/livedumper/helpers.hpp b/src/livedumper/helpers.hpp
index f7f0cb5ce940987cedcd8f7046f19b6c20bb8349..59e850f070bbe9dd044cda6a22242f89322a7f98 100644 (file)
--- a/src/livedumper/helpers.hpp
+++ b/src/livedumper/helpers.hpp
@@ -125,7 +125,16 @@ class Guardian {
  public:
        Guardian(const std::function<void()> &start, const std::function<void()> &end)
                                                                : m_start(start), m_end(end) { m_start(); }
-       ~Guardian() { m_end(); }
+       ~Guardian() {
+               try {
+                       m_end();
+               } catch (...) {
+                       /* Token catch just because this
+                        * is a destructor, which can't rethrow.
+                        * Ignore because we can rely on people
+                        * not to use stupid guard functions. */
+               }
+       }
 };
 
 bool fileExists(const std::string &path) {