Changeset 102182 in webkit

Timestamp:

Dec 6, 2011, 2:41:56 PM (15 years ago)

Author:

msaboff@apple.com

Message:

r102146 from 73875 broke fast/js/encode-URI-test.html
​https://bugs.webkit.org/show_bug.cgi?id=73950

Reviewed by Gavin Barraclough.

• runtime/JSGlobalObjectFunctions.cpp:

(JSC::globalFuncUnescape): Restructured to handle
the %uHHHH case to output the resulting character
and continue so that a failure in finding 4 hex
digits will fall through and output the '%'.
Due to style check, changed the temporary
character variable to a more descriptive name.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• runtime/JSGlobalObjectFunctions.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-12-06  Michael Saboff  <msaboff@apple.com>
+
+        r102146 from 73875 broke fast/js/encode-URI-test.html
+        https://bugs.webkit.org/show_bug.cgi?id=73950
+
+        Reviewed by Gavin Barraclough.
+
+        * runtime/JSGlobalObjectFunctions.cpp:
+        (JSC::globalFuncUnescape): Restructured to handle
+        the %uHHHH case to output the resulting character
+        and continue so that a failure in finding 4 hex
+        digits will fall through and output the '%'.
+        Due to style check, changed the temporary
+        character variable to a more descriptive name.
+
 2011-12-06  Filip Pizlo  <fpizlo@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp

@@ -647 +647 @@
     if (str.is8Bit()) {
         const LChar* characters = str.characters8();
-
+        LChar convertedLChar;
         while (k < len) {
             const LChar* c = characters + k;
@@ -653 +653 @@
                 if (isASCIIHexDigit(c[2]) && isASCIIHexDigit(c[3]) && isASCIIHexDigit(c[4]) && isASCIIHexDigit(c[5])) {
                     builder.append(Lexer<UChar>::convertUnicode(c[2], c[3], c[4], c[5]));
-                    k += 5;
+                    k += 6;
+                    continue;
                 }
             } else if (c[0] == '%' && k <= len - 3 && isASCIIHexDigit(c[1]) && isASCIIHexDigit(c[2])) {
-                builder.append(Lexer<LChar>::convertHex(c[1], c[2]));
+                convertedLChar = LChar(Lexer<LChar>::convertHex(c[1], c[2]));
+                c = &convertedLChar;
                 k += 2;
-            } else
-                builder.append(*c);
+            }
+            builder.append(*c);
             k++;
         }        
@@ -667 +669 @@
         while (k < len) {
             const UChar* c = characters + k;
-            UChar u;
+            UChar convertedUChar;
             if (c[0] == '%' && k <= len - 6 && c[1] == 'u') {
                 if (isASCIIHexDigit(c[2]) && isASCIIHexDigit(c[3]) && isASCIIHexDigit(c[4]) && isASCIIHexDigit(c[5])) {
-                    u = Lexer<UChar>::convertUnicode(c[2], c[3], c[4], c[5]);
-                    c = &u;
+                    convertedUChar = Lexer<UChar>::convertUnicode(c[2], c[3], c[4], c[5]);
+                    c = &convertedUChar;
                     k += 5;
                 }
             } else if (c[0] == '%' && k <= len - 3 && isASCIIHexDigit(c[1]) && isASCIIHexDigit(c[2])) {
-                u = UChar(Lexer<UChar>::convertHex(c[1], c[2]));
-                c = &u;
+                convertedUChar = UChar(Lexer<UChar>::convertHex(c[1], c[2]));
+                c = &convertedUChar;
                 k += 2;
             }