commit 51f5482c98bf2ee013c16b6f2e03a3b043f4f6b9
author Greg Kaiser <gkaiser@google.com> Wed Nov 27 13:37:30 2019 -0800
committer android-build-merger <android-build-merger@google.com> Wed Nov 27 13:37:30 2019 -0800
tree c6035f19de6f9455310c3b234bd537f80a218d7e
parent 68a5d8f2f87b1c9cb77b7dfe70dabd05561f5b32
parent 1fa8f658ed2751625b947daea2e76eee59a233ee

Merge "SecurityManager: Don't use iterator after erase()"
am: 1fa8f658ed

Change-Id: I4457ba24b2f431935121a9d57d0a27b59b8a8a9f

gd/security/internal/security_manager_impl.cc

diff --git a/gd/security/internal/security_manager_impl.cc b/gd/security/internal/security_manager_impl.cc
index 92556c3..7e64dc7 100644
--- a/gd/security/internal/security_manager_impl.cc
+++ b/gd/security/internal/security_manager_impl.cc
@@ -92,8 +92,9 @@
 void SecurityManagerImpl::CancelBond(hci::AddressWithType device) {
   auto entry = pairing_handler_map_.find(device.GetAddress());
   if (entry != pairing_handler_map_.end()) {
+    auto cancel_me = entry->second;
     pairing_handler_map_.erase(entry);
-    entry->second->Cancel();
+    cancel_me->Cancel();
   }
 }