Changeset 233414 in webkit

Timestamp:

Jul 1, 2018 6:52:14 PM (6 years ago)

Author:

Fujii Hironori

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.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/FrameLoader.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-07-01  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <mmaxfield@apple.com>
 

trunk/LayoutTests/platform/wk2/TestExpectations

@@ -157 +157 @@
 
 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 ]

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-07-01  Fujii Hironori  <Hironori.Fujii@sony.com>
+
+        [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  <mmaxfield@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -2012 +2012 @@
         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();