Attachment 346802 Details for Bug 188418 – Patch

[patch] Patch

bug-188418-20180808150553.patch (text/plain), 2.92 KB, created by Alex Christensen on 2018-08-08 15:05:54 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2018-08-08 15:05:54 PDT

Size: 2.92 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 234710)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2018-08-08  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix possible null dereference in WebBackForwardList::restoreFromState
>+        https://bugs.webkit.org/show_bug.cgi?id=188418
>+        <rdar://problem/42531726>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * UIProcess/WebBackForwardList.cpp:
>+        (WebKit::WebBackForwardList::restoreFromState):
>+        Null-check m_page like we do everywhere else in this file because it can be set to null when closing the page.
>+
> 2018-08-08  Commit Queue  <commit-queue@webkit.org>
> 
>         Unreviewed, rolling out r234314, r234320, and r234321.
>Index: Source/WebKit/UIProcess/WebBackForwardList.cpp
>===================================================================
>--- Source/WebKit/UIProcess/WebBackForwardList.cpp	(revision 234663)
>+++ Source/WebKit/UIProcess/WebBackForwardList.cpp	(working copy)
>@@ -433,6 +433,9 @@ BackForwardListState WebBackForwardList:
> 
> void WebBackForwardList::restoreFromState(BackForwardListState backForwardListState)
> {
>+    if (!m_page)
>+        return;
>+
>     Vector<Ref<WebBackForwardListItem>> items;
>     items.reserveInitialCapacity(backForwardListState.items.size());
> 
>Index: Tools/ChangeLog
>===================================================================
>--- Tools/ChangeLog	(revision 234711)
>+++ Tools/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2018-08-08  Alex Christensen  <achristensen@webkit.org>
>+
>+        Fix possible null dereference in WebBackForwardList::restoreFromState
>+        https://bugs.webkit.org/show_bug.cgi?id=188418
>+        <rdar://problem/42531726>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp:
>+        (TestWebKitAPI::TEST):
>+
> 2018-08-08  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         run-builtins-generator-tests does not correctly handle CRLFs from stderr
>Index: Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp
>===================================================================
>--- Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp	(revision 234678)
>+++ Tools/TestWebKitAPI/Tests/WebKit/RestoreSessionState.cpp	(working copy)
>@@ -126,6 +126,18 @@ TEST(WebKit, RestoreSessionStateContaini
>     EXPECT_JS_EQ(webView.page(), "history.scrollRestoration", "auto");
> }
> 
>+TEST(WebKit, RestoreSessionStateAfterClose)
>+{
>+    auto context = adoptWK(WKContextCreate());
>+    PlatformWebView webView(context.get());
>+    setPageLoaderClient(webView.page());
>+    auto data = createSessionStateData(context.get());
>+    EXPECT_NOT_NULL(data);
>+    WKPageClose(webView.page());
>+    auto sessionState = adoptWK(WKSessionStateCreateFromData(data.get()));
>+    WKPageRestoreFromSessionState(webView.page(), sessionState.get());
>+}
>+    
> } // namespace TestWebKitAPI
> 
> #endif

Actions: View | Formatted Diff | Diff

Attachments on bug 188418: 346795 | 346802