Second attemp to fix use-after-free in health check client

6 years ago · fdae4dc833
parent e06b73cab3
commit fdae4dc833
1 changed files with 2 additions and 1 deletions
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@ -407,7 +407,8 @@ class Subchannel::ConnectedSubchannelStateWatcher
    Subchannel* c = self->subchannel_;
    {
      MutexLock lock(&c->mu_);
-      if (self->health_state_ != GRPC_CHANNEL_SHUTDOWN) {
+      if (self->health_state_ != GRPC_CHANNEL_SHUTDOWN &&
+          self->health_check_client_ != nullptr) {
        if (self->last_connectivity_state_ == GRPC_CHANNEL_READY) {
          grpc_connectivity_state_set(&c->state_and_health_tracker_,
                                      self->health_state_,