From 928ec8ee51faf0e57fbc084d6da04d1f85704e07 Mon Sep 17 00:00:00 2001
From: Craig Tiller <ctiller@google.com>
Date: Fri, 5 Jun 2015 08:45:45 -0700
Subject: [PATCH] Fix memory leak

---
 include/grpc++/impl/proto_utils.h | 5 ++++-
 src/cpp/server/server.cc          | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/grpc++/impl/proto_utils.h b/include/grpc++/impl/proto_utils.h
index bf82f2b23d3..9c5f60980aa 100644
--- a/include/grpc++/impl/proto_utils.h
+++ b/include/grpc++/impl/proto_utils.h
@@ -36,6 +36,7 @@
 
 #include <type_traits>
 
+#include <grpc/grpc.h>
 #include <grpc++/impl/serialization_traits.h>
 #include <grpc++/config_protobuf.h>
 #include <grpc++/status.h>
@@ -66,7 +67,9 @@ class SerializationTraits<T, typename std::enable_if<std::is_base_of<
   static Status Deserialize(grpc_byte_buffer* buffer,
                             grpc::protobuf::Message* msg,
                             int max_message_size) {
-    return DeserializeProto(buffer, msg, max_message_size);
+    auto status = DeserializeProto(buffer, msg, max_message_size);
+    grpc_byte_buffer_destroy(buffer);
+    return status;
   }
 };
 
diff --git a/src/cpp/server/server.cc b/src/cpp/server/server.cc
index 824b03e01e2..680f96061c6 100644
--- a/src/cpp/server/server.cc
+++ b/src/cpp/server/server.cc
@@ -129,6 +129,7 @@ class Server::SyncRequest GRPC_FINAL : public CompletionQueueTag {
       ctx_.BeginCompletionOp(&call_);
       method_->handler()->RunHandler(MethodHandler::HandlerParameter(
           &call_, &ctx_, request_payload_, call_.max_message_size()));
+      request_payload_ = nullptr;
       void* ignored_tag;
       bool ignored_ok;
       cq_.Shutdown();