Fix use of v variable after it was freed

The v is freed by eldbus_service_interface_unregister()

Change-Id: I035a976a2f3d851ac0c3292a2b8975855b57e9f1

diff --git a/src/service/DBus.cpp b/src/service/DBus.cpp
index 0720693148adf3785f02df778e605af610b0e801..2a8e3433f387bdbf1e45addde4df7f84076f615e 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);
                        });
                }
        }
@@ -776,4 +778,4 @@ OwnerNameCallbackHandle DBus::registerNameOwnerChangedCallback(DBusWrapper::Conn
                };
        }
        return o;
-}
\ No newline at end of file
+}