diff options
| author | Jordan Kiley <jmkiley@users.noreply.github.com> | 2018-11-13 16:07:19 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 16:07:19 -0800 |
| commit | d44be9a91bbb9d241eff72aa90beb4b12976c47f (patch) | |
| tree | 7abb4407786422875e409dd6234c7a58ce9cea69 | |
| parent | 01d9005c3bab3a725e0be97d545ce6587c53123d (diff) | |
| download | qtlocation-mapboxgl-d44be9a91bbb9d241eff72aa90beb4b12976c47f.tar.gz | |
[ios] Address bad access exception in `MGLAttributionInfo` (#13300)
* [ios] move creation of attributed string to global queue]
* [ios] check if on main queue
| -rw-r--r-- | platform/darwin/src/MGLAttributionInfo.mm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/platform/darwin/src/MGLAttributionInfo.mm b/platform/darwin/src/MGLAttributionInfo.mm index e8d6a203d0..de18fe6f74 100644 --- a/platform/darwin/src/MGLAttributionInfo.mm +++ b/platform/darwin/src/MGLAttributionInfo.mm @@ -65,10 +65,20 @@ 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 |