Changeset 246377 in webkit

Timestamp:

Jun 12, 2019, 3:20:47 PM (7 years ago)

Author:

Kocsen Chung

Message:

Cherry-pick r245298. rdar://problem/51656613

Crash under WebKit::WebProcessProxy::didBecomeUnresponsive()
​https://bugs.webkit.org/show_bug.cgi?id=197883
<rdar://problem/50665984>

Reviewed by Alex Christensen.

Protect |this| in didBecomeUnresponsive() and didExceedCPULimit() since we call client
delegates and those may cause |this| to get destroyed.

• UIProcess/WebProcessProxy.cpp: (WebKit::WebProcessProxy::didBecomeUnresponsive): (WebKit::WebProcessProxy::didExceedCPULimit):

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

Location:

branches/safari-607-branch/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/WebProcessProxy.cpp (modified) (2 diffs)

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

@@ +1 @@
+2019-06-12  Null  <null@apple.com>
+
+        Cherry-pick r245298. rdar://problem/51656613
+
+    Crash under WebKit::WebProcessProxy::didBecomeUnresponsive()
+    https://bugs.webkit.org/show_bug.cgi?id=197883
+    <rdar://problem/50665984>
+    
+    Reviewed by Alex Christensen.
+    
+    Protect |this| in didBecomeUnresponsive() and didExceedCPULimit() since we call client
+    delegates and those may cause |this| to get destroyed.
+    
+    * UIProcess/WebProcessProxy.cpp:
+    (WebKit::WebProcessProxy::didBecomeUnresponsive):
+    (WebKit::WebProcessProxy::didExceedCPULimit):
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@245298 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2019-05-14  Chris Dumez  <cdumez@apple.com>
+
+            Crash under WebKit::WebProcessProxy::didBecomeUnresponsive()
+            https://bugs.webkit.org/show_bug.cgi?id=197883
+            <rdar://problem/50665984>
+
+            Reviewed by Alex Christensen.
+
+            Protect |this| in didBecomeUnresponsive() and didExceedCPULimit() since we call client
+            delegates and those may cause |this| to get destroyed.
+
+            * UIProcess/WebProcessProxy.cpp:
+            (WebKit::WebProcessProxy::didBecomeUnresponsive):
+            (WebKit::WebProcessProxy::didExceedCPULimit):
+
 2019-06-12  Null  <null@apple.com>
 

branches/safari-607-branch/Source/WebKit/UIProcess/WebProcessProxy.cpp

@@ -834 +834 @@
 void WebProcessProxy::didBecomeUnresponsive()
 {
+    auto protectedThis = makeRef(*this);
+
     m_isResponsive = NoOrMaybe::No;
 
@@ -1409 +1411 @@
 void WebProcessProxy::didExceedCPULimit()
 {
+    auto protectedThis = makeRef(*this);
+
     for (auto& page : pages()) {
         if (page->isPlayingAudio()) {