Title: [285884] branches/safari-612.3.6.0-branch/Source/WebKit
Revision
285884
Author
[email protected]
Date
2021-11-16 14:19:49 -0800 (Tue, 16 Nov 2021)

Log 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

Modified Paths

Diff

Modified: branches/safari-612.3.6.0-branch/Source/WebKit/ChangeLog (285883 => 285884)


--- branches/safari-612.3.6.0-branch/Source/WebKit/ChangeLog	2021-11-16 22:05:01 UTC (rev 285883)
+++ branches/safari-612.3.6.0-branch/Source/WebKit/ChangeLog	2021-11-16 22:19:49 UTC (rev 285884)
@@ -1,3 +1,31 @@
+2021-11-16  Russell Epstein  <[email protected]>
+
+        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  <[email protected]>
+
+            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  <[email protected]>
 
         Revert r285683. rdar://problem/83381842

Modified: branches/safari-612.3.6.0-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp (285883 => 285884)


--- branches/safari-612.3.6.0-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp	2021-11-16 22:05:01 UTC (rev 285883)
+++ branches/safari-612.3.6.0-branch/Source/WebKit/WebProcess/WebPage/WebFrame.cpp	2021-11-16 22:19:49 UTC (rev 285884)
@@ -237,8 +237,7 @@
 
 void WebFrame::invalidatePolicyListener()
 {
-    if (!m_policyListenerID)
-        return;
+    Ref protectedThis { *this };
 
     m_policyDownloadID = { };
     m_policyListenerID = 0;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to