Changeset 87713 in webkit

Timestamp:

May 30, 2011 11:28:58 PM (13 years ago)

Author:

koz@chromium.org

Message:

2011-05-30 James Kozianski <​koz@chromium.org>

Reviewed by Kent Tamura.

[Chromium] Make isValidProtocol() accept protocols with '+'.
​https://bugs.webkit.org/show_bug.cgi?id=61759

• platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt: Added.
• platform/chromium/fast/dom/register-protocol-handler-expected.txt: Added.

2011-05-30 James Kozianski <​koz@chromium.org>

Reviewed by Kent Tamura.

[Chromium] Make isValidProtocol() accept protocols with '+'.
​https://bugs.webkit.org/show_bug.cgi?id=61759

Also, detect syntax errors before security errors; some syntax errors
will also trigger a security error, but it's more helpful to the
programmer to know if they have a syntax error, which are well-defined
in the spec, rather than a security error, which aren't.

• page/Navigator.cpp: (WebCore::Navigator::registerProtocolHandler): Detect syntax errors before security errors.
• platform/KURLGoogle.cpp: (WebCore::isSchemeChar): Include '+' in the list of valid characters.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt (added)
• LayoutTests/platform/chromium/fast/dom/register-protocol-handler-expected.txt (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/page/Navigator.cpp (modified) (2 diffs)
• Source/WebCore/platform/KURLGoogle.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-05-30  James Kozianski  <koz@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Make isValidProtocol() accept protocols with '+'.
+        https://bugs.webkit.org/show_bug.cgi?id=61759
+
+        * platform/chromium/fast/dom/navigator-detached-no-crash-expected.txt: Added.
+        * platform/chromium/fast/dom/register-protocol-handler-expected.txt: Added.
+
 2011-05-30  Andrey Petrov  <andrey.petrov@gmail.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-30  James Kozianski  <koz@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        [Chromium] Make isValidProtocol() accept protocols with '+'.
+        https://bugs.webkit.org/show_bug.cgi?id=61759
+
+        Also, detect syntax errors before security errors; some syntax errors
+        will also trigger a security error, but it's more helpful to the
+        programmer to know if they have a syntax error, which are well-defined
+        in the spec, rather than a security error, which aren't.
+
+        * page/Navigator.cpp:
+        (WebCore::Navigator::registerProtocolHandler):
+        Detect syntax errors before security errors.
+        * platform/KURLGoogle.cpp:
+        (WebCore::isSchemeChar):
+        Include '+' in the list of valid characters.
+
 2011-05-30  Andrey Petrov  <andrey.petrov@gmail.com>
 

trunk/Source/WebCore/page/Navigator.cpp

@@ -252 +252 @@
 void Navigator::registerProtocolHandler(const String& scheme, const String& url, const String& title, ExceptionCode& ec)
 {
-    if (!verifyProtocolHandlerScheme(scheme, ec))
-        return;
-
     if (!m_frame)
         return;
@@ -267 +264 @@
         return;
 
+    if (!verifyProtocolHandlerScheme(scheme, ec))
+        return;
+
     Page* page = m_frame->page();
     if (!page)

trunk/Source/WebCore/platform/KURLGoogle.cpp

@@ -131 +131 @@
 static inline bool isSchemeChar(char c)
 {
-    return isSchemeFirstChar(c) || (c >= '0' && c <= '9') || c == '.' || c == '-' || c == '*';
+    return isSchemeFirstChar(c) || (c >= '0' && c <= '9') || c == '.' || c == '-' || c == '+';
 }