Attachment 373135 Details for Bug 199327 – Patch

[patch] Patch

bug-199327-20190628111005.patch (text/plain), 1.85 KB, created by Alex Christensen on 2019-06-28 11:10:06 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-06-28 11:10:06 PDT

Size: 1.85 KB

patch

obsolete

>Subversion Revision: 246896
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index f93c3ea6b030b32dbb13aaf14826353eccf43e0b..3d6817c83625090070c7574be03d79a96376667c 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-28  Alex Christensen  <achristensen@webkit.org>
>+
>+        Null check provisionalItem in FrameLoader::continueLoadAfterNavigationPolicy
>+        https://bugs.webkit.org/show_bug.cgi?id=199327
>+        <rdar://problem/48262384>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::continueLoadAfterNavigationPolicy):
>+        Sometimes provisionalItem is null.  Let's not crash.
>+
> 2019-06-27  Beth Dakin  <bdakin@apple.com>
> 
>         Upstream use of MACCATALYST
>diff --git a/Source/WebCore/loader/FrameLoader.cpp b/Source/WebCore/loader/FrameLoader.cpp
>index 7e4136038a53a1a0d64035cdb895a4bc2ab05739..246de9a4dac8b6e27d47a8cdfeabe2556f16da21 100644
>--- a/Source/WebCore/loader/FrameLoader.cpp
>+++ b/Source/WebCore/loader/FrameLoader.cpp
>@@ -3468,7 +3468,7 @@ void FrameLoader::continueLoadAfterNavigationPolicy(const ResourceRequest& reque
> 
>     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());

Actions: View | Formatted Diff | Diff

Attachments on bug 199327: 373135