Attachment 361898 Details for Bug 194584 – Adds a nullcheck

[patch] Adds a nullcheck

bug-194584-20190212225549.patch (text/plain), 1.37 KB, created by Ryosuke Niwa on 2019-02-12 22:55:49 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Ryosuke Niwa

Created: 2019-02-12 22:55:49 PST

Size: 1.37 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241347)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-02-12  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 NOBODY (OOPS!).
>+
>+        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-12  Youenn Fablet  <youenn@apple.com>
> 
>         WebServiceWorkerProvider::handleFetch no longer needs a CachedResource parameter
>Index: Source/WebKit/WebProcess/WebPage/WebPage.cpp
>===================================================================
>--- Source/WebKit/WebProcess/WebPage/WebPage.cpp	(revision 241339)
>+++ Source/WebKit/WebProcess/WebPage/WebPage.cpp	(working copy)
>@@ -3045,7 +3045,8 @@ void WebPage::setActivityState(OptionSet
>     if (changed)
>         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);
>     }

Actions: View | Formatted Diff | Diff

Attachments on bug 194584: 361898