Title: [267687] branches/safari-610-branch/Source/WebKit
- Revision
- 267687
- Author
- [email protected]
- Date
- 2020-09-27 13:00:52 -0700 (Sun, 27 Sep 2020)
Log 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
Modified Paths
Diff
Modified: branches/safari-610-branch/Source/WebKit/ChangeLog (267686 => 267687)
--- branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:50 UTC (rev 267686)
+++ branches/safari-610-branch/Source/WebKit/ChangeLog 2020-09-27 20:00:52 UTC (rev 267687)
@@ -1,5 +1,36 @@
2020-09-27 Alan Coon <[email protected]>
+ 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 <[email protected]>
+
+ 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 <[email protected]>
+
Cherry-pick r267496. rdar://problem/69594104
[macOS] Change name of client decoder entitlement
Modified: branches/safari-610-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp (267686 => 267687)
--- branches/safari-610-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp 2020-09-27 20:00:50 UTC (rev 267686)
+++ branches/safari-610-branch/Source/WebKit/NetworkProcess/NetworkSession.cpp 2020-09-27 20:00:52 UTC (rev 267687)
@@ -297,6 +297,9 @@
Optional<WebCore::RegistrableDomain> NetworkSession::firstPartyHostCNAMEDomain(const String& firstPartyHost)
{
#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())
return WTF::nullopt;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
