Changeset 285884 in webkit

Timestamp:

Nov 16, 2021, 2:19:49 PM (5 years ago)

Author:

Russell Epstein

Message:

Cherry-pick r283386. rdar://problem/83953959

Protect WebFrame during invalidatePolicyListener()
​https://bugs.webkit.org/show_bug.cgi?id=229981
<rdar://problem/82807413>

Reviewed by Alex Christensen.

• WebProcess/WebPage/WebFrame.cpp: (WebKit::WebFrame::invalidatePolicyListeners): Protect the WebFrame while policy handlers are run.

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

Location:

branches/safari-612.3.6.0-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• WebProcess/WebPage/WebFrame.cpp (modified) (1 diff)

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

@@ +1 @@
+2021-11-16  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r283386. rdar://problem/83953959
+
+    Protect WebFrame during invalidatePolicyListener()
+    https://bugs.webkit.org/show_bug.cgi?id=229981
+    <rdar://problem/82807413>
+    
+    Reviewed by Alex Christensen.
+    
+    * WebProcess/WebPage/WebFrame.cpp:
+    (WebKit::WebFrame::invalidatePolicyListeners): Protect the WebFrame while
+    policy handlers are run.
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@283386 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2021-10-01  Brent Fulgham  <bfulgham@apple.com>
+
+            Protect WebFrame during invalidatePolicyListener()
+            https://bugs.webkit.org/show_bug.cgi?id=229981
+            <rdar://problem/82807413>
+
+            Reviewed by Alex Christensen.
+
+            * WebProcess/WebPage/WebFrame.cpp:
+            (WebKit::WebFrame::invalidatePolicyListeners): Protect the WebFrame while
+            policy handlers are run.
+
 2021-11-12  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-612.3.6.0-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp

@@ -238 +238 @@
 void WebFrame::invalidatePolicyListener()
 {
-    if (!m_policyListenerID)
-        return;
+    Ref protectedThis { *this };
 
     m_policyDownloadID = { };