Changeset 170511 in webkit

Timestamp:

Jun 26, 2014 5:27:05 PM (10 years ago)

Author:

gyuyoung.kim@samsung.com

Message:

Rearrange conditions to find invalid protocol in NavigatorContentUtils::verifyProtocolHandlerScheme()
​https://bugs.webkit.org/show_bug.cgi?id=134289

Reviewed by Darin Adler.

If we do early return when there is invalid protocol, we're able to avoid unnecessary call flow.

No new tests, covered by existing tests.

• Modules/navigatorcontentutils/NavigatorContentUtils.cpp:

(WebCore::verifyProtocolHandlerScheme):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• Modules/navigatorcontentutils/NavigatorContentUtils.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-06-26  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
+
+        Rearrange conditions to find invalid protocol in NavigatorContentUtils::verifyProtocolHandlerScheme()
+        https://bugs.webkit.org/show_bug.cgi?id=134289
+
+        Reviewed by Darin Adler.
+
+        If we do early return when there is invalid protocol, we're able to avoid unnecessary call flow.
+
+        No new tests, covered by existing tests.
+
+        * Modules/navigatorcontentutils/NavigatorContentUtils.cpp:
+        (WebCore::verifyProtocolHandlerScheme):
+
 2014-06-26  Benjamin Poulain  <bpoulain@apple.com>
 

trunk/Source/WebCore/Modules/navigatorcontentutils/NavigatorContentUtils.cpp

@@ -104 +104 @@
 static bool verifyProtocolHandlerScheme(const String& scheme, ExceptionCode& ec)
 {
+    if (isProtocolWhitelisted(scheme))
+        return true;
+
     if (scheme.startsWith("web+")) {
         // The specification requires that the length of scheme is at least five characters (including 'web+' prefix).
         if (scheme.length() >= 5 && isValidProtocol(scheme))
             return true;
-        ec = SECURITY_ERR;
-        return false;
-    }
-
-    if (isProtocolWhitelisted(scheme))
-        return true;
+    }
 
     ec = SECURITY_ERR;