Changeset 267687 in webkit

Timestamp:

Sep 27, 2020, 1:00:52 PM (6 years ago)

Author:

Alan Coon

Message:

Cherry-pick r267540. rdar://problem/69593993

CrashTracer: com.apple.WebKit.Networking in NetworkSession::firstPartyHostCNAMEDomain() code
​https://bugs.webkit.org/show_bug.cgi?id=216934
<rdar://problem/69216768>

Reviewed by Alex Christensen.

Add a check for a valid key.

• NetworkProcess/NetworkSession.cpp: (WebKit::NetworkSession::firstPartyHostCNAMEDomain):

git-svn-id: ​https://svn.webkit.org/repository/webkit/trunk@267540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Location:

branches/safari-610-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/NetworkSession.cpp (modified) (1 diff)

branches/safari-610-branch/Source/WebKit/ChangeLog

@@ +1 @@
+2020-09-27  Alan Coon  <alancoon@apple.com>
+
+        Cherry-pick r267540. rdar://problem/69593993
+
+    CrashTracer: com.apple.WebKit.Networking in NetworkSession::firstPartyHostCNAMEDomain() code
+    https://bugs.webkit.org/show_bug.cgi?id=216934
+    <rdar://problem/69216768>
+    
+    Reviewed by Alex Christensen.
+    
+    Add a check for a valid key.
+    
+    * NetworkProcess/NetworkSession.cpp:
+    (WebKit::NetworkSession::firstPartyHostCNAMEDomain):
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@267540 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-09-24  Kate Cheney  <katherine_cheney@apple.com>
+
+            CrashTracer: com.apple.WebKit.Networking in NetworkSession::firstPartyHostCNAMEDomain() code
+            https://bugs.webkit.org/show_bug.cgi?id=216934
+            <rdar://problem/69216768>
+
+            Reviewed by Alex Christensen.
+
+            Add a check for a valid key.
+
+            * NetworkProcess/NetworkSession.cpp:
+            (WebKit::NetworkSession::firstPartyHostCNAMEDomain):
+
 2020-09-27  Alan Coon  <alancoon@apple.com>
 

branches/safari-610-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp

@@ -298 +298 @@
 {
 #if HAVE(CFNETWORK_CNAME_AND_COOKIE_TRANSFORM_SPI)
+    if (!decltype(m_firstPartyHostCNAMEDomains)::isValidKey(firstPartyHost))
+        return WTF::nullopt;
+
     auto iterator = m_firstPartyHostCNAMEDomains.find(firstPartyHost);
     if (iterator == m_firstPartyHostCNAMEDomains.end())