From b4a926961abc9e29016b2ba30093f3925de10514 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 4 Jan 2019 09:40:18 -0800
Subject: Fix static analizer errors

---
 src/objective-c/GRPCClient/GRPCCallOptions.m         | 11 ++++++++---
 src/objective-c/GRPCClient/private/GRPCChannelPool.h |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/objective-c/GRPCClient/GRPCCallOptions.m b/src/objective-c/GRPCClient/GRPCCallOptions.m
index d3440ee6c0..e59a812bd8 100644
--- a/src/objective-c/GRPCClient/GRPCCallOptions.m
+++ b/src/objective-c/GRPCClient/GRPCCallOptions.m
@@ -160,7 +160,10 @@ static BOOL areObjectsEqual(id obj1, id obj2) {
     _timeout = timeout < 0 ? 0 : timeout;
     _oauth2AccessToken = [oauth2AccessToken copy];
     _authTokenProvider = authTokenProvider;
-    _initialMetadata = [[NSDictionary alloc] initWithDictionary:initialMetadata copyItems:YES];
+    _initialMetadata =
+        initialMetadata == nil
+            ? nil
+            : [[NSDictionary alloc] initWithDictionary:initialMetadata copyItems:YES];
     _userAgentPrefix = [userAgentPrefix copy];
     _responseSizeLimit = responseSizeLimit;
     _compressionAlgorithm = compressionAlgorithm;
@@ -171,7 +174,9 @@ static BOOL areObjectsEqual(id obj1, id obj2) {
     _connectInitialBackoff = connectInitialBackoff < 0 ? 0 : connectInitialBackoff;
     _connectMaxBackoff = connectMaxBackoff < 0 ? 0 : connectMaxBackoff;
     _additionalChannelArgs =
-        [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
+        additionalChannelArgs == nil
+            ? nil
+            : [[NSDictionary alloc] initWithDictionary:additionalChannelArgs copyItems:YES];
     _PEMRootCertificates = [PEMRootCertificates copy];
     _PEMPrivateKey = [PEMPrivateKey copy];
     _PEMCertificateChain = [PEMCertificateChain copy];
@@ -458,7 +463,7 @@ static BOOL areObjectsEqual(id obj1, id obj2) {
 
 - (void)setConnectMinTimeout:(NSTimeInterval)connectMinTimeout {
   if (connectMinTimeout < 0) {
-    connectMinTimeout = 0;
+    _connectMinTimeout = 0;
   } else {
     _connectMinTimeout = connectMinTimeout;
   }
diff --git a/src/objective-c/GRPCClient/private/GRPCChannelPool.h b/src/objective-c/GRPCClient/private/GRPCChannelPool.h
index d3a99ca826..e00ee69e63 100644
--- a/src/objective-c/GRPCClient/private/GRPCChannelPool.h
+++ b/src/objective-c/GRPCClient/private/GRPCChannelPool.h
@@ -88,7 +88,8 @@ NS_ASSUME_NONNULL_BEGIN
 /**
  * Return a channel with a particular configuration. The channel may be a cached channel.
  */
-- (GRPCPooledChannel *)channelWithHost:(NSString *)host callOptions:(GRPCCallOptions *)callOptions;
+- (nullable GRPCPooledChannel *)channelWithHost:(NSString *)host
+                                    callOptions:(GRPCCallOptions *)callOptions;
 
 /**
  * Disconnect all channels in this pool.
-- 
cgit v1.2.3