Title: [233414] trunk
Revision
233414
Author
[email protected]
Date
2018-07-01 18:52:14 -0700 (Sun, 01 Jul 2018)

Log Message

[WK2] fast/parser/document-open-in-unload.html makes the following test crash
https://bugs.webkit.org/show_bug.cgi?id=98345
<rdar://problem/12474923>

Reviewed by Ryosuke Niwa.

Source/WebCore:

m_documentLoader can become null in the middle of
FrameLoader::commitProvisionalLoad by stopping the loading.

No new tests (Covered by existing tests).

* loader/FrameLoader.cpp:
(WebCore::FrameLoader::commitProvisionalLoad): Do null check of m_documentLoader.

LayoutTests:

* platform/wk2/TestExpectations: Unskipped fast/parser/document-open-in-unload.html.

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (233413 => 233414)


--- trunk/LayoutTests/ChangeLog	2018-07-02 01:36:43 UTC (rev 233413)
+++ trunk/LayoutTests/ChangeLog	2018-07-02 01:52:14 UTC (rev 233414)
@@ -1,3 +1,13 @@
+2018-07-01  Fujii Hironori  <[email protected]>
+
+        [WK2] fast/parser/document-open-in-unload.html makes the following test crash
+        https://bugs.webkit.org/show_bug.cgi?id=98345
+        <rdar://problem/12474923>
+
+        Reviewed by Ryosuke Niwa.
+
+        * platform/wk2/TestExpectations: Unskipped fast/parser/document-open-in-unload.html.
+
 2018-07-01  Myles C. Maxfield  <[email protected]>
 
         [Cocoa] LastResort in the font family list causes emoji with joiners to be rendered as multiple .notdef characters

Modified: trunk/LayoutTests/platform/wk2/TestExpectations (233413 => 233414)


--- trunk/LayoutTests/platform/wk2/TestExpectations	2018-07-02 01:36:43 UTC (rev 233413)
+++ trunk/LayoutTests/platform/wk2/TestExpectations	2018-07-02 01:52:14 UTC (rev 233414)
@@ -157,9 +157,6 @@
 
 webkit.org/b/105952 fast/loader/submit-form-while-parsing-2.html [ Pass Failure ]
 
-# Causes next test to crash only on WebKit2
-webkit.org/b/98345 fast/parser/document-open-in-unload.html [ Skip ]
-
 webkit.org/b/141122 editing/selection/programmatic-selection-on-mac-is-directionless.html [ Pass Failure ]
 
 webkit.org/b/149087 http/tests/cache/disk-cache/disk-cache-cancel.html [ Pass Failure ]

Modified: trunk/Source/WebCore/ChangeLog (233413 => 233414)


--- trunk/Source/WebCore/ChangeLog	2018-07-02 01:36:43 UTC (rev 233413)
+++ trunk/Source/WebCore/ChangeLog	2018-07-02 01:52:14 UTC (rev 233414)
@@ -1,3 +1,19 @@
+2018-07-01  Fujii Hironori  <[email protected]>
+
+        [WK2] fast/parser/document-open-in-unload.html makes the following test crash
+        https://bugs.webkit.org/show_bug.cgi?id=98345
+        <rdar://problem/12474923>
+
+        Reviewed by Ryosuke Niwa.
+
+        m_documentLoader can become null in the middle of
+        FrameLoader::commitProvisionalLoad by stopping the loading.
+
+        No new tests (Covered by existing tests).
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::commitProvisionalLoad): Do null check of m_documentLoader.
+
 2018-07-01  Myles C. Maxfield  <[email protected]>
 
         [Cocoa] LastResort in the font family list causes emoji with joiners to be rendered as multiple .notdef characters

Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (233413 => 233414)


--- trunk/Source/WebCore/loader/FrameLoader.cpp	2018-07-02 01:36:43 UTC (rev 233413)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp	2018-07-02 01:52:14 UTC (rev 233414)
@@ -2011,7 +2011,7 @@
     LOG(Loading, "WebCoreLoading %s: Finished committing provisional load to URL %s", m_frame.tree().uniqueName().string().utf8().data(),
         m_frame.document() ? m_frame.document()->url().stringCenterEllipsizedToLength().utf8().data() : "");
 
-    if (m_loadType == FrameLoadType::Standard && m_documentLoader->isClientRedirect())
+    if (m_loadType == FrameLoadType::Standard && m_documentLoader && m_documentLoader->isClientRedirect())
         history().updateForClientRedirect();
 
     if (m_loadingFromCachedPage) {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to