From cb745ceaf9f9ffd90447498a6e8a57d5ac600389 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 19 Oct 2018 15:46:57 -0700
Subject: [PATCH] Synchronized access to fetchedOauth2AccessToken

---
 src/objective-c/GRPCClient/GRPCCall.m | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/objective-c/GRPCClient/GRPCCall.m b/src/objective-c/GRPCClient/GRPCCall.m
index daa7e8dd4a1..34a0e436eaa 100644
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@@ -581,8 +581,12 @@ const char *kCFStreamVarName = "grpc_cfstream";
   }
 
   NSMutableDictionary *headers = _requestHeaders;
-  if (_fetchedOauth2AccessToken != nil) {
-    headers[@"authorization"] = [kBearerPrefix stringByAppendingString:_fetchedOauth2AccessToken];
+  __block NSString *fetchedOauth2AccessToken;
+  @synchronized(self) {
+    fetchedOauth2AccessToken = _fetchedOauth2AccessToken;
+  }
+  if (fetchedOauth2AccessToken != nil) {
+    headers[@"authorization"] = [kBearerPrefix stringByAppendingString:fetchedOauth2AccessToken];
   } else if (_callOptions.oauth2AccessToken != nil) {
     headers[@"authorization"] =
         [kBearerPrefix stringByAppendingString:_callOptions.oauth2AccessToken];