Changeset 273297 in webkit

Timestamp:

Feb 22, 2021, 7:34:22 PM (6 years ago)

Author:

Devin Rousso

Message:

[Payment Request] REGRESSION(r273143): crash shortly after showing the Apple Pay sheet
​https://bugs.webkit.org/show_bug.cgi?id=222298
<rdar://problem/74557943>

Reviewed by Wenson Hsieh.

• Platform/cocoa/PaymentAuthorizationPresenter.mm:

(WebKit::toNSErrors):
Don't use adoptNS with +[NSMutableArray array] since that returns an autoreleased object.
Use the helper createNSArray instead (as was previously done before r273143).

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Platform/cocoa/PaymentAuthorizationPresenter.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2021-02-22  Devin Rousso  <drousso@apple.com>
+
+        [Payment Request] REGRESSION(r273143): crash shortly after showing the Apple Pay sheet
+        https://bugs.webkit.org/show_bug.cgi?id=222298
+        <rdar://problem/74557943>
+
+        Reviewed by Wenson Hsieh.
+
+        * Platform/cocoa/PaymentAuthorizationPresenter.mm:
+        (WebKit::toNSErrors):
+        Don't use `adoptNS` with `+[NSMutableArray array]` since that returns an autoreleased object.
+        Use the helper `createNSArray` instead (as was previously done before r273143).
+
 2021-02-22  Wenson Hsieh  <wenson_hsieh@apple.com>
 

trunk/Source/WebKit/Platform/cocoa/PaymentAuthorizationPresenter.mm

@@ -181 +181 @@
 static RetainPtr<NSArray> toNSErrors(const Vector<RefPtr<WebCore::ApplePayError>>& errors)
 {
-    auto array = adoptNS(NSMutableArray.array);
-    for (auto& error : errors) {
-        if (error)
-            [array addObject:toNSError(*error)];
-    }
-    return array;
+    return createNSArray(errors, [] (auto& error) -> NSError * {
+        return error ? toNSError(*error) : nil;
+    });
 }