Attachment 373675 Details for Bug 199596 – Patch

[patch] Patch

bug-199596-20190708155448.patch (text/plain), 1.76 KB, created by Alex Christensen on 2019-07-08 15:54:50 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-07-08 15:54:50 PDT

Size: 1.76 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 247230)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,15 @@
>+2019-07-08  Alex Christensen  <achristensen@webkit.org>
>+
>+        Null check HistoryItems given to loadDifferentDocumentItem
>+        https://bugs.webkit.org/show_bug.cgi?id=199596
>+        <rdar://problem/49884391>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * loader/FrameLoader.cpp:
>+        (WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad):
>+        Under some rare and mysterious conditions we can have a null provisionalItem when loading from the cache.
>+
> 2019-07-08  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Unable to paste from Notes into Excel 365 spreadsheet
>Index: Source/WebCore/loader/FrameLoader.cpp
>===================================================================
>--- Source/WebCore/loader/FrameLoader.cpp	(revision 247092)
>+++ Source/WebCore/loader/FrameLoader.cpp	(working copy)
>@@ -3868,10 +3868,11 @@ void FrameLoader::retryAfterFailedCacheO
>     ASSERT(history().provisionalItem() == m_requestedHistoryItem.get());
> 
>     FrameLoadType loadType = m_loadType;
>-    HistoryItem& item = *history().provisionalItem();
>+    HistoryItem* item = history().provisionalItem();
> 
>     stopAllLoaders(ShouldNotClearProvisionalItem);
>-    loadDifferentDocumentItem(item, history().currentItem(), loadType, MayNotAttemptCacheOnlyLoadForFormSubmissionItem, ShouldTreatAsContinuingLoad::No);
>+    if (item)
>+        loadDifferentDocumentItem(*item, history().currentItem(), loadType, MayNotAttemptCacheOnlyLoadForFormSubmissionItem, ShouldTreatAsContinuingLoad::No);
> }
> 
> ResourceError FrameLoader::cancelledError(const ResourceRequest& request) const

Flags:

rniwa: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 199596: 373675