[#3991] catch all exceptions in destructor

diff --git a/src/lib/asiolink/unix_domain_socket.cc b/src/lib/asiolink/unix_domain_socket.cc
index 18c1f48a05437935d33dfeeeef8240dce61f7008..7b365eeb74eab7944c898211257599a8dc041822 100644 (file)
--- a/src/lib/asiolink/unix_domain_socket.cc
+++ b/src/lib/asiolink/unix_domain_socket.cc
@@ -32,9 +32,12 @@ public:
     /// @brief Destructor.
     ///
     /// Closes the socket.
-    // cppcheck-suppress throwInNoexceptFunction
     ~UnixDomainSocketImpl() {
-        close();
+        try {
+            close();
+        } catch (...) {
+            // catch all exceptions.
+        }
     }
 
     /// @brief Asynchronously connects to an endpoint.

diff --git a/src/lib/util/unlock_guard.h b/src/lib/util/unlock_guard.h
index 5cb49fc9784c9b34cf447e442c2644d3e0c7adea..8d202250594b0d09f1acdf323bffd889df808f6c 100644 (file)
--- a/src/lib/util/unlock_guard.h
+++ b/src/lib/util/unlock_guard.h
@@ -32,9 +32,12 @@ public:
     /// @brief Destructor.
     ///
     /// Lock mutex object on destructor.
-    // cppcheck-suppress throwInNoexceptFunction
     ~UnlockGuard() {
-        lock_.lock();
+        try {
+            lock_.lock();
+        } catch (...) {
+            // catch all exceptions.
+        }
     }
 
 private: