diff options
| author |  Muxi Yan <muxi@users.noreply.github.com> | 2018-05-16 09:51:24 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-05-16 09:51:24 -0700 |
| commit | fd30b02486861a3da6019b86bd5e8d90a1ec3aba (patch) | |
| tree | 3f37979376daa99eb68d163b50edcb7af97eb05a /src/objective-c/GRPCClient/private | |
| parent | e4c349eb56974f6000258dad84081a1721390a2e (diff) | |
| parent | ed0c562d672ea1895f2f9c673e8255f3ef923302 (diff) | |
Merge pull request #13498 from lipka/utf8
Objective-C: UTF8 encoding for error messages and metadata values
Diffstat (limited to 'src/objective-c/GRPCClient/private')
| -rw-r--r-- | src/objective-c/GRPCClient/private/NSDictionary+GRPC.m | 2 | ||||
| -rw-r--r-- | src/objective-c/GRPCClient/private/NSError+GRPC.m | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/objective-c/GRPCClient/private/NSDictionary+GRPC.m b/src/objective-c/GRPCClient/private/NSDictionary+GRPC.m index af1ce0bf23..730a1436e4 100644 --- a/src/objective-c/GRPCClient/private/NSDictionary+GRPC.m +++ b/src/objective-c/GRPCClient/private/NSDictionary+GRPC.m @@ -54,7 +54,7 @@ + (instancetype)grpc_stringFromMetadataValue:(grpc_metadata *)metadata { return [[self alloc] initWithBytes:GRPC_SLICE_START_PTR(metadata->value) length:GRPC_SLICE_LENGTH(metadata->value) - encoding:NSASCIIStringEncoding]; + encoding:NSUTF8StringEncoding]; } // Precondition: This object contains only ASCII characters. diff --git a/src/objective-c/GRPCClient/private/NSError+GRPC.m b/src/objective-c/GRPCClient/private/NSError+GRPC.m index 74cfa943cc..c2e65e4d8a 100644 --- a/src/objective-c/GRPCClient/private/NSError+GRPC.m +++ b/src/objective-c/GRPCClient/private/NSError+GRPC.m @@ -27,7 +27,7 @@ NSString *const kGRPCErrorDomain = @"io.grpc"; if (statusCode == GRPC_STATUS_OK) { return nil; } - NSString *message = [NSString stringWithCString:details encoding:NSASCIIStringEncoding]; + NSString *message = [NSString stringWithCString:details encoding:NSUTF8StringEncoding]; return [NSError errorWithDomain:kGRPCErrorDomain code:statusCode userInfo:@{NSLocalizedDescriptionKey : message}]; |