From db8f50c35b5032480155c22d766e8e221daa6c4c Mon Sep 17 00:00:00 2001 From: Daniel Cohen Gindi Date: Sun, 1 Apr 2018 12:01:09 +0300 Subject: [PATCH] Guard against `nil` in NSDictionary --- ios/RNGeocoder/RNGeocoder.m | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ios/RNGeocoder/RNGeocoder.m b/ios/RNGeocoder/RNGeocoder.m index 1a54347..2efdb96 100644 --- a/ios/RNGeocoder/RNGeocoder.m +++ b/ios/RNGeocoder/RNGeocoder.m @@ -82,20 +82,19 @@ - (NSArray *)placemarksToDictionary:(NSArray *)placemarks { for (int i = 0; i < placemarks.count; i++) { CLPlacemark* placemark = [placemarks objectAtIndex:i]; - NSString* name = [NSNull null]; + NSObject *name = nil; if (![placemark.name isEqualToString:placemark.locality] && ![placemark.name isEqualToString:placemark.thoroughfare] && ![placemark.name isEqualToString:placemark.subThoroughfare]) { - name = placemark.name; } NSArray *lines = placemark.addressDictionary[@"FormattedAddressLines"]; NSDictionary *result = @{ - @"feature": name, + @"feature": name ?: NSNull.null, @"position": @{ @"lat": [NSNumber numberWithDouble:placemark.location.coordinate.latitude], @"lng": [NSNumber numberWithDouble:placemark.location.coordinate.longitude],