Changeset 27406 in webkit for trunk/JavaScriptCore/kjs/ustring.cpp

Timestamp:

Nov 3, 2007, 9:40:32 AM (18 years ago)

Author:

Darin Adler

Message:

JavaScriptCore:

Reviewed by Maciej.

• fix ​http://bugs.webkit.org/show_bug.cgi?id=15814 <rdar://problem/5536644> fast/js/kde/encode_decode_uri.html fails

These changes cause us to match the JavaScript specification and pass the
fast/js/kde/encode_decode_uri.html test.

• kjs/function.cpp: (KJS::encode): Call the UTF-8 string conversion in its new strict mode, throwing an exception if there are malformed UTF-16 surrogate pairs in the text.

• kjs/ustring.h: Added a strict version of the UTF-8 string conversion.
• kjs/ustring.cpp: (KJS::decodeUTF8Sequence): Removed code to disallow U+FFFE and U+FFFF; while those might be illegal in some sense, they aren't supposed to get any special handling in the place where this function is currently used. (KJS::UString::UTF8String): Added the strictness.

LayoutTests:

Reviewed by Maciej.

• updates for ​http://bugs.webkit.org/show_bug.cgi?id=15814 <rdar://problem/5536644> fast/js/kde/encode_decode_uri.html fails

• fast/js/kde/resources/encode_decode_uri.js: Rewrote the test to cover edges better, and use the should functions in a way that makes failures easier to understand.
• fast/js/kde/encode_decode_uri-expected.txt: Updated.

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (4 diffs)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -1348 +1348 @@
     if (c >= 0xD800 && c <= 0xDFFF)
       return -1;
-    // Backwards BOM and U+FFFF should never appear in UTF-8 data.
-    if (c == 0xFFFE || c == 0xFFFF)
-      return -1;
     return c;
   }
@@ -1370 +1367 @@
 }
 
-CString UString::UTF8String() const
-{
+CString UString::UTF8String(bool* utf16WasGood) const
+{
+  if (utf16WasGood)
+    *utf16WasGood = true;
+
   // Allocate a buffer big enough to hold all the characters.
   const int length = size();
@@ -1394 +1394 @@
       ++i;
     } else {
+      if (utf16WasGood && c >= 0xD800 && c <= 0xDFFF)
+        *utf16WasGood = false;
       *p++ = (char)((c >> 12) | 0xE0); // E0 is the 3-byte flag for UTF-8
       *p++ = (char)(((c >> 6) | 0x80) & 0xBF); // next 6 bits, with high bit set
@@ -1406 +1408 @@
 }
 
+CString UString::UTF8String() const
+{
+    return UTF8String(0);
+}
+
+
 } // namespace KJS