Merge pull request #2074 from jcanizales/fix-metadata-usage-in-example

Fix NPE for trying to add metadata to error when it was nil
10 years ago · c1c697a897
parent 454260605a c58a1103b6
commit c1c697a897
1 changed files with 6 additions and 3 deletions
--- a/src/objective-c/GRPCClient/GRPCCall.m
+++ b/src/objective-c/GRPCClient/GRPCCall.m
@ -319,9 +319,12 @@ NSString * const kGRPCStatusMetadataKey = @"io.grpc.StatusMetadataKey";
    if (strongSelf) {
      [strongSelf->_responseMetadata addEntriesFromDictionary:trailers];

-      NSMutableDictionary *userInfo = [NSMutableDictionary dictionaryWithDictionary:error.userInfo];
-      userInfo[kGRPCStatusMetadataKey] = strongSelf->_responseMetadata;
-      error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
+      if (error) {
+        NSMutableDictionary *userInfo =
+            [NSMutableDictionary dictionaryWithDictionary:error.userInfo];
+        userInfo[kGRPCStatusMetadataKey] = strongSelf->_responseMetadata;
+        error = [NSError errorWithDomain:error.domain code:error.code userInfo:userInfo];
+      }
      [strongSelf finishWithError:error];
    }
  }];