Reviewed by eseidel.

        Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10876
        containsItemForURLUnicode uses matchLetter instead of
        matchUnicodeLetter

        Small fixes for _WebCoreHistoryProvider.

        * History/WebHistory.m: Consistently use BUFFER_SIZE #define
        (-[_WebCoreHistoryProvider containsItemForURLLatin1:length:]):
        (-[_WebCoreHistoryProvider containsItemForURLUnicode:length:]):
        Replace incorrect call to matchLetter to matchUnicodeLetter

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@16375 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b5bc5430852bff5d7f37ac8e370f15691850e162..12d971e8a141b0db039ebf3a96021da133347d9b 100644 (file)
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,18 @@
+2006-09-15  Adam Roben  <aroben@apple.com>
+
+        Reviewed by eseidel.
+
+        Fixes http://bugzilla.opendarwin.org/show_bug.cgi?id=10876
+        containsItemForURLUnicode uses matchLetter instead of
+        matchUnicodeLetter
+
+        Small fixes for _WebCoreHistoryProvider.
+
+        * History/WebHistory.m: Consistently use BUFFER_SIZE #define
+        (-[_WebCoreHistoryProvider containsItemForURLLatin1:length:]):
+        (-[_WebCoreHistoryProvider containsItemForURLUnicode:length:]):
+        Replace incorrect call to matchLetter to matchUnicodeLetter
+
 2006-09-13  Brady Eidson <beidson@apple.com>
 
         Reviewed by Maciej

diff --git a/WebKit/History/WebHistory.m b/WebKit/History/WebHistory.m
index 6ca2fbc4cd8293d6e5f0241e44b24470166e956f..3e98fbd52a6dc531f179e072e5e7f788fb1a9b86 100644 (file)
--- a/WebKit/History/WebHistory.m
+++ b/WebKit/History/WebHistory.m
@@ -590,7 +590,7 @@ static inline bool matchUnicodeLetter(UniChar c, UniChar lowercaseLetter)
     }
 
     if (needToAddSlash) {
-        if (length + 1 <= 2048) {
+        if (length + 1 <= BUFFER_SIZE) {
             strBuffer = staticStrBuffer;
         } else {
             strBuffer = malloc(length + 2);
@@ -614,10 +614,12 @@ static inline bool matchUnicodeLetter(UniChar c, UniChar lowercaseLetter)
     return result;
 }
 
+#define UNICODE_BUFFER_SIZE 1024
+
 - (BOOL)containsItemForURLUnicode:(const UniChar *)unicode length:(unsigned)length
 {
     const UniChar *unicodeStr = unicode;
-    UniChar staticStrBuffer[1024];
+    UniChar staticStrBuffer[UNICODE_BUFFER_SIZE];
     UniChar *strBuffer = NULL;
     BOOL needToAddSlash = FALSE;
 
@@ -627,7 +629,7 @@ static inline bool matchUnicodeLetter(UniChar c, UniChar lowercaseLetter)
         matchUnicodeLetter(unicode[2], 't') &&
         matchUnicodeLetter(unicode[3], 'p') &&
         (unicode[4] == ':' 
-         || (matchLetter(unicode[4], 's') && unicode[5] == ':'))) {
+         || (matchUnicodeLetter(unicode[4], 's') && unicode[5] == ':'))) {
 
         unsigned pos = unicode[4] == ':' ? 5 : 6;
 
@@ -646,7 +648,7 @@ static inline bool matchUnicodeLetter(UniChar c, UniChar lowercaseLetter)
     }
 
     if (needToAddSlash) {
-        if (length + 1 <= 1024) {
+        if (length + 1 <= UNICODE_BUFFER_SIZE) {
             strBuffer = staticStrBuffer;
         } else {
             strBuffer = malloc(sizeof(UniChar) * (length + 1));