Fix possible deadlock in RemoveExternalConnectivityWatcher

5 years ago · b6a5cbf830
parent 83c99aa2da
commit b6a5cbf830
1 changed files with 9 additions and 5 deletions
--- a/src/core/ext/filters/client_channel/client_channel.cc
+++ b/src/core/ext/filters/client_channel/client_channel.cc
@ -184,12 +184,16 @@ class ChannelData {

  void RemoveExternalConnectivityWatcher(grpc_closure* on_complete,
                                         bool cancel) {
-    MutexLock lock(&external_watchers_mu_);
-    auto it = external_watchers_.find(on_complete);
-    if (it != external_watchers_.end()) {
-      if (cancel) it->second->Cancel();
-      external_watchers_.erase(it);
+    ExternalConnectivityWatcher* watcher = nullptr;
+    {
+      MutexLock lock(&external_watchers_mu_);
+      auto it = external_watchers_.find(on_complete);
+      if (it != external_watchers_.end()) {
+        watcher = it->second;
+        external_watchers_.erase(it);
+      }
    }
+    if (watcher != nullptr && cancel) watcher->Cancel();
  }

  int NumExternalConnectivityWatchers() const {