Changeset 247266 in webkit

Timestamp:

Jul 9, 2019 11:55:43 AM (5 years ago)

Author:

achristensen@apple.com

Message:

Null check HistoryItems given to loadDifferentDocumentItem
​https://bugs.webkit.org/show_bug.cgi?id=199596
<rdar://problem/49884391>

Reviewed by Ryosuke Niwa.

• loader/FrameLoader.cpp:

(WebCore::FrameLoader::retryAfterFailedCacheOnlyMainResourceLoad):
Under some rare and mysterious conditions we can have a null provisionalItem when loading from the cache.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2019-07-09  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 Ryosuke Niwa.
+
+        * 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-09  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/loader/FrameLoader.cpp

@@ -3869 +3869 @@
 
     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);
+    else {
+        ASSERT_NOT_REACHED();
+        RELEASE_LOG_ERROR(ResourceLoading, "Retrying load after failed cache-only main resource load failed because there is no provisional history item.");
+    }
 }