allow null got_message

1 files changed, 6 insertions, 2 deletions

diff --git a/src/cpp/common/call.cc b/src/cpp/common/call.cc
index d706ec45e5..3f9b4852b9 100644
--- a/src/cpp/common/call.cc
+++ b/src/cpp/common/call.cc
@@ -256,12 +256,16 @@ void CallOpBuffer::FinalizeResult(void **tag, bool *status) {
   // Parse received message if any.
   if (recv_message_) {
     if (recv_message_buf_) {
-      *got_message_ = true;
+      if (got_message_) {
+        *got_message_ = true;
+      }
       *status = DeserializeProto(recv_message_buf_, recv_message_);
       grpc_byte_buffer_destroy(recv_message_buf_);
       recv_message_buf_ = nullptr;
     } else {
-      *got_message_ = false;
+      if (got_message_) {
+        *got_message_ = false;
+      }
     }
   }
   // Parse received status.