Changeset 246942 in webkit

Timestamp:

Jun 28, 2019 3:24:23 PM (5 years ago)

Author:

commit-queue@webkit.org

Message:

Make getHostnamesWithCookies more robust
​https://bugs.webkit.org/show_bug.cgi?id=199334
<rdar://problem/51860593>

Patch by Alex Christensen <​achristensen@webkit.org> on 2019-06-28
Reviewed by Brent Fulgham.

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):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/cocoa/NetworkStorageSessionCocoa.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+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 Brent Fulgham.
+
+        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-28  chris fleizach  <cfleizach@apple.com>
 

trunk/Source/WebCore/platform/network/cocoa/NetworkStorageSessionCocoa.mm

@@ -488 +488 @@
     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;