Merge pull request #24235 from markdroth/xds_tsan_fix

Fix use-after-free bug
4 years ago · b102b8817c
parent 5604d4d441 ac6f3a7818
commit b102b8817c
1 changed files with 1 additions and 1 deletions
--- a/src/core/ext/xds/xds_client.cc
+++ b/src/core/ext/xds/xds_client.cc
@ -172,6 +172,7 @@ class XdsClient::ChannelState::AdsCallState
        MutexLock lock(&self->ads_calld_->xds_client()->mu_);
        self->OnTimerLocked(GRPC_ERROR_REF(error));
      }
+      self->ads_calld_.reset();
      self->Unref(DEBUG_LOCATION, "timer");
    }

@ -213,7 +214,6 @@ class XdsClient::ChannelState::AdsCallState
        }
        GRPC_ERROR_UNREF(watcher_error);
      }
-      ads_calld_.reset();
      GRPC_ERROR_UNREF(error);
    }