Title: [287042] branches/safari-613.1.12-branch/Source/WebCore
- Revision
- 287042
- Author
- [email protected]
- Date
- 2021-12-14 12:23:42 -0800 (Tue, 14 Dec 2021)
Log Message
Cherry-pick r287011. rdar://problem/86438924
WebContent process crashes at ContentSecurityPolicySourceList::matchesAll
https://bugs.webkit.org/show_bug.cgi?id=234288
rdar://problem/86438924
Reviewed by Simon Fraser.
* page/csp/ContentSecurityPolicyDirectiveList.cpp:
(WebCore::ContentSecurityPolicyDirectiveList::violatedDirectiveForScript const):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287011 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-613.1.12-branch/Source/WebCore/ChangeLog (287041 => 287042)
--- branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-14 20:11:48 UTC (rev 287041)
+++ branches/safari-613.1.12-branch/Source/WebCore/ChangeLog 2021-12-14 20:23:42 UTC (rev 287042)
@@ -1,3 +1,30 @@
+2021-12-14 Alan Coon <[email protected]>
+
+ Cherry-pick r287011. rdar://problem/86438924
+
+ WebContent process crashes at ContentSecurityPolicySourceList::matchesAll
+ https://bugs.webkit.org/show_bug.cgi?id=234288
+ rdar://problem/86438924
+
+ Reviewed by Simon Fraser.
+
+ * page/csp/ContentSecurityPolicyDirectiveList.cpp:
+ (WebCore::ContentSecurityPolicyDirectiveList::violatedDirectiveForScript const):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@287011 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-12-13 Kate Cheney <[email protected]>
+
+ WebContent process crashes at ContentSecurityPolicySourceList::matchesAll
+ https://bugs.webkit.org/show_bug.cgi?id=234288
+ rdar://problem/86438924
+
+ Reviewed by Simon Fraser.
+
+ * page/csp/ContentSecurityPolicyDirectiveList.cpp:
+ (WebCore::ContentSecurityPolicyDirectiveList::violatedDirectiveForScript const):
+
2021-12-13 Youenn Fablet <[email protected]>
Fix ServiceWorker downloads
Modified: branches/safari-613.1.12-branch/Source/WebCore/page/csp/ContentSecurityPolicyDirectiveList.cpp (287041 => 287042)
--- branches/safari-613.1.12-branch/Source/WebCore/page/csp/ContentSecurityPolicyDirectiveList.cpp 2021-12-14 20:11:48 UTC (rev 287041)
+++ branches/safari-613.1.12-branch/Source/WebCore/page/csp/ContentSecurityPolicyDirectiveList.cpp 2021-12-14 20:23:42 UTC (rev 287042)
@@ -391,7 +391,7 @@
{
auto* operativeDirective = this->operativeDirective(m_scriptSrc.get(), ContentSecurityPolicyDirectiveNames::scriptSrcElem);
- if (operativeDirective->containsAllHashes(subResourceIntegrityDigests))
+ if (!operativeDirective || operativeDirective->containsAllHashes(subResourceIntegrityDigests))
return nullptr;
if (checkSource(operativeDirective, url, didReceiveRedirectResponse))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
