Attachment 373141 Details for Bug 199334 – Patch

[patch] Patch

bug-199334-20190628123204.patch (text/plain), 1.73 KB, created by Alex Christensen on 2019-06-28 12:32:04 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-28 12:32:04 PDT

Size: 1.73 KB

patch

obsolete

>Subversion Revision: 246896
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f93c3ea6b030b32dbb13aaf14826353eccf43e0b..ca7ace304e5117829d28b722ed44898bd37ae2c6 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,17 @@
>+2019-06-28  Alex Christensen  <achristensen@webkit.org>
>+
>+        Make getHostnamesWithCookies more robust
>+        https://bugs.webkit.org/show_bug.cgi?id=199334
>+        <rdar://problem/51860593>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Crash logs suggest either httpCookies is returning a nil cookie or a cookie without a domain.
>+        This should not happen, but if it does we shouldn't crash.
>+
>+        * platform/network/cocoa/NetworkStorageSessionCocoa.mm:
>+        (WebCore::NetworkStorageSession::getHostnamesWithCookies):
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>diff --git a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>index 557e977b4d72ac8197e99e296e4c21007673cc6c..84b73b8344b0cab5a9048b485efb176d5d340581 100644
>--- a/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>+++ b/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm
>@@ -487,8 +487,12 @@ void NetworkStorageSession::getHostnamesWithCookies(HashSet<String>& hostnames)
> 
>     NSArray *cookies = httpCookies(cookieStorage().get());
>     
>-    for (NSHTTPCookie* cookie in cookies)
>-        hostnames.add([cookie domain]);
>+    for (NSHTTPCookie* cookie in cookies) {
>+        if (NSString *domain = [cookie domain])
>+            hostnames.add(domain);
>+        else
>+            ASSERT_NOT_REACHED();
>+    }
>     
>     END_BLOCK_OBJC_EXCEPTIONS;
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 199334: 373141