Fix free-after-use bug in server callback handler (grpc#27187)

Successful asan run https://source.cloud.google.com/results/invocations/33bc587c-a440-45bd-9886-a23789645a7d/targets Successful TGP available upon request.
librato · Aug 31, 2021 · 0407f4b · 0407f4b
1 parent b9cf89c
commit 0407f4b
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/include/grpcpp/impl/codegen/server_callback_handlers.h b/include/grpcpp/impl/codegen/server_callback_handlers.h
@@ -81,7 +81,7 @@ class CallbackUnaryHandler : public ::grpc::internal::MethodHandler {
     ::grpc::ByteBuffer buf;
     buf.set_buffer(req);
     RequestType* request = nullptr;
-    MessageHolder<RequestType, ResponseType>* allocator_state = nullptr;
+    MessageHolder<RequestType, ResponseType>* allocator_state;
     if (allocator_ != nullptr) {
       allocator_state = allocator_->AllocateMessages();
     } else {
@@ -98,8 +98,6 @@ class CallbackUnaryHandler : public ::grpc::internal::MethodHandler {
     if (status->ok()) {
       return request;
     }
-    // Clean up on deserialization failure.
-    allocator_state->Release();
     return nullptr;
   }