Changeset 225186 in webkit

Timestamp:

Nov 27, 2017 12:23:13 PM (6 years ago)

Author:

achristensen@apple.com

Message:

imported/w3c/web-platform-tests/url/failure.html crashes on debug builds
​https://bugs.webkit.org/show_bug.cgi?id=172337

Reviewed by Chris Dumez.

There were two problems:

1. Invalid URLs can contain non-ASCII characters in its UTF8 representation.

We should not put these URLs into content extension finite state machines. They won't load anyways.

2. If we don't have any content extensions installed, we still call String.utf8 unnecessarily. Let's not.

• contentextensions/ContentExtensionsBackend.cpp:

(WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad const):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• contentextensions/ContentExtensionsBackend.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-11-27  Alex Christensen  <achristensen@webkit.org>
+
+        imported/w3c/web-platform-tests/url/failure.html crashes on debug builds
+        https://bugs.webkit.org/show_bug.cgi?id=172337
+
+        Reviewed by Chris Dumez.
+
+        There were two problems:
+        1. Invalid URLs can contain non-ASCII characters in its UTF8 representation.
+        We should not put these URLs into content extension finite state machines.  They won't load anyways.
+        2. If we don't have any content extensions installed, we still call String.utf8 unnecessarily.  Let's not.
+
+        * contentextensions/ContentExtensionsBackend.cpp:
+        (WebCore::ContentExtensions::ContentExtensionsBackend::actionsForResourceLoad const):
+
 2017-11-27  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Source/WebCore/contentextensions/ContentExtensionsBackend.cpp

@@ -77 +77 @@
     double addedTimeStart = monotonicallyIncreasingTime();
 #endif
-    if (resourceLoadInfo.resourceURL.protocolIsData())
+    if (m_contentExtensions.isEmpty()
+        || !resourceLoadInfo.resourceURL.isValid()
+        || resourceLoadInfo.resourceURL.protocolIsData())
         return { };
 
     const String& urlString = resourceLoadInfo.resourceURL.string();
     ASSERT_WITH_MESSAGE(urlString.isAllASCII(), "A decoded URL should only contain ASCII characters. The matching algorithm assumes the input is ASCII.");
-    const CString& urlCString = urlString.utf8();
+    const auto urlCString = urlString.utf8();
 
     Vector<Action> finalActions;