Changeset 287042 in webkit

Timestamp:

Dec 14, 2021, 12:23:42 PM (5 years ago)

Author:

Russell Epstein

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

Location:

branches/safari-613.1.12-branch/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/csp/ContentSecurityPolicyDirectiveList.cpp (modified) (1 diff)

branches/safari-613.1.12-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2021-12-14  Alan Coon  <alancoon@apple.com>
+
+        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  <katherine_cheney@apple.com>
+
+            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  <youenn@apple.com>
 

branches/safari-613.1.12-branch/Source/WebCore/page/csp/ContentSecurityPolicyDirectiveList.cpp

@@ -392 +392 @@
     auto* operativeDirective = this->operativeDirective(m_scriptSrc.get(), ContentSecurityPolicyDirectiveNames::scriptSrcElem);
 
-    if (operativeDirective->containsAllHashes(subResourceIntegrityDigests))
+    if (!operativeDirective || operativeDirective->containsAllHashes(subResourceIntegrityDigests))
         return nullptr;