From 3f00d61b04874cc5f0159c16f2c598a8f2fb93a7 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 7 Dec 2018 16:12:00 -0800
Subject: [PATCH] batch fix

---
 .../GRPCClient/private/GRPCWrappedCall.m       |  1 +
 src/objective-c/ProtoRPC/ProtoRPC.m            | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
index 9066cb950f4..4edd9d3e378 100644
--- a/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
+++ b/src/objective-c/GRPCClient/private/GRPCWrappedCall.m
@@ -320,6 +320,7 @@
       _call = NULL;
     }
   }
+  // Explicitly converting weak reference _pooledChannel to strong.
   __strong GRPCPooledChannel *channel = _pooledChannel;
   [channel notifyWrappedCallDealloc:self];
 }
diff --git a/src/objective-c/ProtoRPC/ProtoRPC.m b/src/objective-c/ProtoRPC/ProtoRPC.m
index 15b0f681ce3..abf224c3cfd 100644
--- a/src/objective-c/ProtoRPC/ProtoRPC.m
+++ b/src/objective-c/ProtoRPC/ProtoRPC.m
@@ -140,7 +140,11 @@ static NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsing
 }
 
 - (void)start {
-  [_call start];
+  GRPCCall2 *copiedCall;
+  @synchronized(self) {
+    copiedCall = _call;
+  }
+  [copiedCall start];
 }
 
 - (void)cancel {
@@ -177,20 +181,20 @@ static NSError *ErrorForBadProto(id proto, Class expectedClass, NSError *parsing
     return;
   }
 
-  GRPCCall2 *call;
+  GRPCCall2 *copiedCall;
   @synchronized(self) {
-    call = _call;
+    copiedCall = _call;
   }
-  [call writeData:[message data]];
+  [copiedCall writeData:[message data]];
 }
 
 - (void)finish {
-  GRPCCall2 *call;
+  GRPCCall2 *copiedCall;
   @synchronized(self) {
-    call = _call;
+    copiedCall = _call;
     _call = nil;
   }
-  [call finish];
+  [copiedCall finish];
 }
 
 - (void)didReceiveInitialMetadata:(NSDictionary *)initialMetadata {