CommonAPI-D-Bus 3.1.10.43.1.10.4

3 files changed, 12 insertions, 1 deletions

diff --git a/CHANGES b/CHANGES
index 634f973..ecc3954 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
 Changes
 =======
 
+v3.1.10.4
+- Prevent crash (double free) on destruction of static objects
+- Fixed 'terminate called without an active exception' on verification test exit
+
 v3.1.10.3
 - Fixed crash on dlclose()
 
diff --git a/src/CommonAPI/DBus/DBusConnection.cpp b/src/CommonAPI/DBus/DBusConnection.cpp
index 768f214..3ed06a7 100644
--- a/src/CommonAPI/DBus/DBusConnection.cpp
+++ b/src/CommonAPI/DBus/DBusConnection.cpp
@@ -474,6 +474,8 @@ void DBusConnection::disconnect() {
         if (enforcerThread_->joinable() &&
                 std::this_thread::get_id() != enforcerThread_->get_id()) {
             enforcerThread_->join();
+        } else {
+            enforcerThread_->detach();
         }
 
         // remote mainloop watchers
diff --git a/src/CommonAPI/DBus/DBusFactory.cpp b/src/CommonAPI/DBus/DBusFactory.cpp
index 64c39d4..31a44c4 100644
--- a/src/CommonAPI/DBus/DBusFactory.cpp
+++ b/src/CommonAPI/DBus/DBusFactory.cpp
@@ -17,12 +17,17 @@
 namespace CommonAPI {
 namespace DBus {
 
+static std::weak_ptr<CommonAPI::Runtime> runtime__;
+
 INITIALIZER(FactoryInit) {
+    runtime__ = Runtime::get();
     Runtime::get()->registerFactory("dbus", Factory::get());
 }
 
 DEINITIALIZER(FactoryDeinit) {
-    Runtime::get()->unregisterFactory("dbus");
+    if (auto rt = runtime__.lock()) {
+        rt->unregisterFactory("dbus");
+    }
 }
 
 std::shared_ptr<CommonAPI::DBus::Factory>