Title: [247021] trunk/Source/WebCore
- Revision
- 247021
- Author
- [email protected]
- Date
- 2019-07-01 14:11:36 -0700 (Mon, 01 Jul 2019)
Log Message
Null check provisionalItem in FrameLoader::continueLoadAfterNavigationPolicy
https://bugs.webkit.org/show_bug.cgi?id=199327
<rdar://problem/48262384>
Patch by Alex Christensen <[email protected]> on 2019-07-01
Reviewed by Darin Adler.
* loader/FrameLoader.cpp:
(WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
Sometimes provisionalItem is null. Let's not crash.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (247020 => 247021)
--- trunk/Source/WebCore/ChangeLog 2019-07-01 21:11:29 UTC (rev 247020)
+++ trunk/Source/WebCore/ChangeLog 2019-07-01 21:11:36 UTC (rev 247021)
@@ -1,3 +1,15 @@
+2019-07-01 Alex Christensen <[email protected]>
+
+ Null check provisionalItem in FrameLoader::continueLoadAfterNavigationPolicy
+ https://bugs.webkit.org/show_bug.cgi?id=199327
+ <rdar://problem/48262384>
+
+ Reviewed by Darin Adler.
+
+ * loader/FrameLoader.cpp:
+ (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
+ Sometimes provisionalItem is null. Let's not crash.
+
2019-07-01 Truitt Savell <[email protected]>
Unreviewed, rolling out r246958.
Modified: trunk/Source/WebCore/loader/FrameLoader.cpp (247020 => 247021)
--- trunk/Source/WebCore/loader/FrameLoader.cpp 2019-07-01 21:11:29 UTC (rev 247020)
+++ trunk/Source/WebCore/loader/FrameLoader.cpp 2019-07-01 21:11:36 UTC (rev 247021)
@@ -3473,7 +3473,7 @@
if (isBackForwardLoadType(type)) {
auto& diagnosticLoggingClient = m_frame.page()->diagnosticLoggingClient();
- if (history().provisionalItem()->isInPageCache()) {
+ if (history().provisionalItem() && history().provisionalItem()->isInPageCache()) {
diagnosticLoggingClient.logDiagnosticMessageWithResult(DiagnosticLoggingKeys::pageCacheKey(), DiagnosticLoggingKeys::retrievalKey(), DiagnosticLoggingResultPass, ShouldSample::Yes);
loadProvisionalItemFromCachedPage();
RELEASE_LOG_IF_ALLOWED("continueLoadAfterNavigationPolicy: can't continue loading frame because it will be loaded from cache (frame = %p, main = %d)", &m_frame, m_frame.isMainFrame());
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
