Changeset 241401 in webkit

Timestamp:

Feb 13, 2019 1:07:23 AM (5 years ago)

Author:

rniwa@webkit.org

Message:

Crash in Page::setActivityState because m_page is null
​https://bugs.webkit.org/show_bug.cgi?id=194584

Reviewed by Antti Koivisto.

Add a null check to avoid the crash. Also add a debug assertion to help diagnose this in the future.

• WebProcess/WebPage/WebPage.cpp:

(WebKit::WebPage::setActivityState):

Location:

trunk/Source/WebKit

Files:

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

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-02-13  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Crash in Page::setActivityState because m_page is null
+        https://bugs.webkit.org/show_bug.cgi?id=194584
+
+        Reviewed by Antti Koivisto.
+
+        Add a null check to avoid the crash. Also add a debug assertion to help diagnose this in the future.
+
+        * WebProcess/WebPage/WebPage.cpp:
+        (WebKit::WebPage::setActivityState):
+
 2019-02-13  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebKit/WebProcess/WebPage/WebPage.cpp

@@ -3046 +3046 @@
         updateThrottleState();
 
-    {
+    ASSERT_WITH_MESSAGE(m_page, "setActivityState called on %lld but WebCore page was null", pageID());
+    if (m_page) {
         SetForScope<bool> currentlyChangingActivityState { m_changingActivityState, true };
         m_page->setActivityState(activityState);