Changeset 245298 in webkit

Timestamp:

May 14, 2019, 12:48:09 PM (7 years ago)

Author:

Chris Dumez

Message:

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):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+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-05-14  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/WebProcessProxy.cpp

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