[ios, macos] Ensure potential variables that might be nil have a fallback. (#15645)

* [ios] Ensure potential variables that might be nil have a fallback.

* [ios, macos] (potentially) free the returned arch info.

1 files changed, 12 insertions, 3 deletions

diff --git a/platform/darwin/src/MGLSDKMetricsManager.m b/platform/darwin/src/MGLSDKMetricsManager.m
index ed48eaf0c1..828fbcd505 100644
--- a/platform/darwin/src/MGLSDKMetricsManager.m
+++ b/platform/darwin/src/MGLSDKMetricsManager.m
@@ -42,12 +42,21 @@ NSString* MGLStringFromMetricType(MGLMetricType metricType) {
                                 [UIScreen mainScreen].bounds.size.height];
         
         NSLocale *currentLocale = [NSLocale currentLocale];
-        NSString *country = [currentLocale objectForKey:NSLocaleCountryCode];
+        
+        NSString *country = [currentLocale objectForKey:NSLocaleCountryCode] ?: @"unknown";
         
         NSString *device = deviceName();
         
-        const NXArchInfo localArchInfo = *NXGetLocalArchInfo();
-        NSString *abi = [NSString stringWithUTF8String:localArchInfo.description];
+        NSString *abi = @"unknown";
+        
+        {
+            const NXArchInfo *localArchInfo = NXGetLocalArchInfo();
+        
+            if (localArchInfo) {
+                abi = @(localArchInfo->description);
+                NXFreeArchInfo(localArchInfo);
+            }
+        }
         
         NSString *ram = [NSString stringWithFormat:@"%llu", [NSProcessInfo processInfo].physicalMemory];