Changeset 295642 in webkit

Timestamp:

Jun 17, 2022, 12:06:35 PM (3 years ago)

Author:

achristensen@apple.com

Message:

New test: [macOS/iOS arm64] TestWebKitAPI.WKContentRuleListStoreTest.CrossOriginCookieBlocking is crashing
​https://bugs.webkit.org/show_bug.cgi?id=241653

Reviewed by Yusuke Suzuki.

• Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentExtensionStore.mm:

(TEST_F):

Canonical link: ​https://commits.webkit.org/251647@main

File:

• trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentExtensionStore.mm (modified) (1 diff)

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKContentExtensionStore.mm

@@ -225 +225 @@
                 auto path = HTTPServer::parsePath(request);
                 auto response = [&] {
-                    if (path == "/com"_s)
+                    if (path == "/com"_s) {
+#if CPU(ARM64E) && defined(NDEBUG)
+                        // FIXME: This is exactly equivalent code, but the code below crashes on release builds on arm64e.
+                        // See rdar://95391568
+                        HashMap<String, String> headerFields;
+                        headerFields.reserveInitialCapacity(1);
+                        headerFields.add("Set-Cookie"_s, "testCookie=42; Path=/; SameSite=None; Secure"_s);
+                        return HTTPResponse(WTFMove(headerFields), "<script>alert('hi')</script>"_s);
+#else
                         return HTTPResponse({ { "Set-Cookie"_s, "testCookie=42; Path=/; SameSite=None; Secure"_s } }, "<script>alert('hi')</script>"_s);
+#endif
+                    }
                     if (path == "/org"_s)
                         return HTTPResponse("<script>fetch('https://example.com/cookie-check', {credentials: 'include'})</script>"_s);