Changeset 228612 in webkit

Timestamp:

Feb 19, 2018 12:25:47 AM (6 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r228096 - Crash on sfgate.com because mismatching link preload types
​https://bugs.webkit.org/show_bug.cgi?id=182483
<rdar://problem/37065331>

Reviewed by Daniel Bates.

Source/WebCore:

Preloading the same URL with different 'as' types causes some confusion.

Test: http/tests/preload/link-preload-type-mismatch.html

• loader/LinkLoader.cpp:

(WebCore::createLinkPreloadResourceClient):

Ensure we use the actual resource type when creating the client.

(WebCore::LinkLoader::preloadIfNeeded):

Don't construct client if the types don't match. This can happen if there is an existing
preload for the same resource with different type.

LayoutTests:

• http/tests/preload/link-preload-type-mismatch-expected.txt: Added.
• http/tests/preload/link-preload-type-mismatch.html: Added.

Location:

releases/WebKitGTK/webkit-2.20

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/preload/link-preload-type-mismatch-expected.txt (added)
• LayoutTests/http/tests/preload/link-preload-type-mismatch.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/loader/LinkLoader.cpp (modified) (2 diffs)

releases/WebKitGTK/webkit-2.20/LayoutTests/ChangeLog

@@ +1 @@
+2018-02-05  Antti Koivisto  <antti@apple.com>
+
+        Crash on sfgate.com because mismatching link preload types
+        https://bugs.webkit.org/show_bug.cgi?id=182483
+        <rdar://problem/37065331>
+
+        Reviewed by Daniel Bates.
+
+        * http/tests/preload/link-preload-type-mismatch-expected.txt: Added.
+        * http/tests/preload/link-preload-type-mismatch.html: Added.
+
 2018-02-05  Manuel Rego Casasnovas  <rego@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/ChangeLog

@@ +1 @@
+2018-02-05  Antti Koivisto  <antti@apple.com>
+
+        Crash on sfgate.com because mismatching link preload types
+        https://bugs.webkit.org/show_bug.cgi?id=182483
+        <rdar://problem/37065331>
+
+        Reviewed by Daniel Bates.
+
+        Preloading the same URL with different 'as' types causes some confusion.
+
+        Test: http/tests/preload/link-preload-type-mismatch.html
+
+        * loader/LinkLoader.cpp:
+        (WebCore::createLinkPreloadResourceClient):
+
+            Ensure we use the actual resource type when creating the client.
+
+        (WebCore::LinkLoader::preloadIfNeeded):
+
+            Don't construct client if the types don't match. This can happen if there is an existing
+            preload for the same resource with different type.
+
 2018-02-05  Manuel Rego Casasnovas  <rego@igalia.com>
 

releases/WebKitGTK/webkit-2.20/Source/WebCore/loader/LinkLoader.cpp

@@ -136 +136 @@
 }
 
-static std::unique_ptr<LinkPreloadResourceClient> createLinkPreloadResourceClient(CachedResource& resource, LinkLoader& loader, CachedResource::Type type)
-{
-    switch (type) {
+static std::unique_ptr<LinkPreloadResourceClient> createLinkPreloadResourceClient(CachedResource& resource, LinkLoader& loader)
+{
+    switch (resource.type()) {
     case CachedResource::ImageResource:
         return LinkPreloadImageResourceClient::create(loader, static_cast<CachedImage&>(resource));
@@ -240 +240 @@
     auto cachedLinkResource = document.cachedResourceLoader().preload(type.value(), WTFMove(linkRequest)).value_or(nullptr);
 
+    if (cachedLinkResource && cachedLinkResource->type() != *type)
+        return nullptr;
+
     if (cachedLinkResource && loader)
-        return createLinkPreloadResourceClient(*cachedLinkResource, *loader, type.value());
+        return createLinkPreloadResourceClient(*cachedLinkResource, *loader);
     return nullptr;
 }