[ios] Address bad access exception in MGLAttributionInfo (#13300)

* [ios] move creation of attributed string to global queue] * [ios] check if on main queue
mapbox · Nov 14, 2018 · d44be9a · d44be9a
1 parent 01d9005
commit d44be9a
Showing 1 changed file with 14 additions and 4 deletions.
diff --git a/platform/darwin/src/MGLAttributionInfo.mm b/platform/darwin/src/MGLAttributionInfo.mm
@@ -65,10 +65,20 @@ @implementation MGLAttributionInfo
     NSData *htmlData = [styledHTML dataUsingEncoding:NSUTF8StringEncoding];
 
 #if TARGET_OS_IPHONE
-    NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithData:htmlData
-                                                                                          options:options
-                                                                               documentAttributes:nil
-                                                                                            error:NULL];
+    __block NSMutableAttributedString *attributedString;
+    dispatch_block_t initialization = ^{
+            // This initializer should be called from a global or main queue. https://developer.apple.com/documentation/foundation/nsattributedstring/1524613-initwithdata
+            attributedString = [[NSMutableAttributedString alloc] initWithData:htmlData
+                                                                       options:options
+                                                            documentAttributes:nil
+                                                                         error:NULL];
+    };
+
+    if (![[NSThread currentThread] isMainThread]) {
+        dispatch_sync(dispatch_get_main_queue(), initialization);
+    } else {
+        initialization();
+    }
 #else
     NSMutableAttributedString *attributedString = [[NSMutableAttributedString alloc] initWithHTML:htmlData
                                                                                           options:options