Changeset 89336 in webkit

Timestamp:

Jun 20, 2011 11:05:22 PM (13 years ago)

Author:

aestes@apple.com

Message:

2011-06-20 Andy Estes <​aestes@apple.com>

Reviewed by Darin Adler.

KURL::protocolIs(const char* protocol) asserts in Debug builds with
valid protocols
​https://bugs.webkit.org/show_bug.cgi?id=61572

No new tests. No code currently calls protocolIs() with a protocol that
contains a non-letter character.

• platform/KURL.cpp: (WebCore::isSchemeCharacterMatchIgnoringCase): A helper function that compares two characters ignoring case. It assumes (and asserts) that both characters are valid scheme characters, and that if the second argument is a letter that it is lowercase. (WebCore::KURL::protocolIs): Call isSchemeCharacterMatchIgnoringCase() instead of isLetterMatchIgnoringCase().

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/KURL.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-20  Andy Estes  <aestes@apple.com>
+
+        Reviewed by Darin Adler.
+
+        KURL::protocolIs(const char* protocol) asserts in Debug builds with
+        valid protocols
+        https://bugs.webkit.org/show_bug.cgi?id=61572
+
+        No new tests. No code currently calls protocolIs() with a protocol that
+        contains a non-letter character.
+
+        * platform/KURL.cpp:
+        (WebCore::isSchemeCharacterMatchIgnoringCase): A helper function that
+        compares two characters ignoring case. It assumes (and asserts) that
+        both characters are valid scheme characters, and that if the second
+        argument is a letter that it is lowercase.
+        (WebCore::KURL::protocolIs): Call isSchemeCharacterMatchIgnoringCase()
+        instead of isLetterMatchIgnoringCase().
+
 2011-06-20  Dai Mikurube  <dmikurube@chromium.org>
 

trunk/Source/WebCore/platform/KURL.cpp

@@ -242 +242 @@
 static inline bool isPathSegmentEndChar(UChar c) { return c <= 0xff && (characterClassTable[c] & PathSegmentEndChar); }
 static inline bool isBadChar(unsigned char c) { return characterClassTable[c] & BadChar; }
+    
+static inline bool isSchemeCharacterMatchIgnoringCase(char character, char schemeCharacter)
+{
+    ASSERT(isSchemeChar(character));
+    ASSERT(schemeCharacter & 0x20);
+    ASSERT(isASCIILower(schemeCharacter) || (!isASCIIUpper(schemeCharacter) && isSchemeChar(schemeCharacter)));
+    return (character | 0x20) == schemeCharacter;
+}
 
 static inline int hexDigitValue(UChar c)
@@ -703 +711 @@
     // Do the comparison without making a new string object.
     for (int i = 0; i < m_schemeEnd; ++i) {
-        if (!protocol[i] || !isLetterMatchIgnoringCase(m_string[i], protocol[i]))
+        if (!protocol[i] || !isSchemeCharacterMatchIgnoringCase(m_string[i], protocol[i]))
             return false;
     }