From 9a99965adab379a5965484a59334a80bc576e49e Mon Sep 17 00:00:00 2001 From: avakulenko Date: Thu, 2 Apr 2015 11:51:32 -0700 Subject: Fix memory leak in dbus::ObjectManager::RemoveInterface D-Bus Object Manager proxy class was leaking PropertySet object instances stored in properties_map when an interface was removed. Make sure we delete the PropertySet before we remove the map entry. BUG=472654 Review URL: https://codereview.chromium.org/1055713002 Cr-Commit-Position: refs/heads/master@{#323544} --- dbus/object_manager.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/dbus/object_manager.cc b/dbus/object_manager.cc index 181a73b..851fee4 100644 --- a/dbus/object_manager.cc +++ b/dbus/object_manager.cc @@ -482,6 +482,7 @@ void ObjectManager::RemoveInterface(const ObjectPath& object_path, interface->ObjectRemoved(object_path, interface_name); } + delete piter->second; object->properties_map.erase(piter); if (object->properties_map.empty()) { -- cgit v1.1