Merge pull request #23728 from markdroth/server_c++_fix

Fix use-after-free bug introduced in #23581.
4 years ago · 7be8e6a84b
parent fc4c9d74ee 1723e8ce22
commit 7be8e6a84b
1 changed files with 2 additions and 1 deletions
--- a/src/core/lib/surface/server.cc
+++ b/src/core/lib/surface/server.cc
@ -1115,8 +1115,9 @@ void Server::ChannelData::AcceptStream(void* arg, grpc_transport* /*transport*/,

 void Server::ChannelData::FinishDestroy(void* cd, grpc_error* /*error*/) {
  auto* chand = static_cast<Server::ChannelData*>(cd);
+  Server* server = chand->server_.get();
  GRPC_CHANNEL_INTERNAL_UNREF(chand->channel_, "server");
-  chand->server_->Unref();
+  server->Unref();
 }

 void Server::ChannelData::Destroy() {