[SVACE] Fixes use of v variable after it was freed by eldbus_service_interface_unregi...

Change-Id: I1e1d68d6dd2fd3c2dffd74f52c2648495633149a

diff --git a/src/service/DBus.cpp b/src/service/DBus.cpp
index 0720693..b75782e 100644 (file)
--- a/src/service/DBus.cpp
+++ b/src/service/DBus.cpp
@@ -677,9 +677,11 @@ struct DefaultDBusWrapper : public DBusWrapper
                        DBUS_DEBUG("registering interface %p (%d)", v, fallback ? 1 : 0);
                        destructors.push_back([=]() {
                                DBUS_DEBUG("unregistering interface %p", v);
+                               {
+                                       std::lock_guard<std::mutex> lock(globalEntriesMutex);
+                                       globalEntries.erase(v);
+                               }
                                eldbus_service_interface_unregister(v);
-                               std::lock_guard<std::mutex> lock(globalEntriesMutex);
-                               globalEntries.erase(v);
                        });
                }
        }