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

Timestamp:

May 13, 2008, 2:46:47 AM (17 years ago)

Author:

[email protected]

Message:

Reviewed by Geoffrey Garen.

<rdar://problem/4949018> JavaScriptCore API claims to work with UTF8 strings, but only works
with ASCII strings

• kjs/ustring.h:
• kjs/ustring.cpp: (KJS::UString::Rep::createFromUTF8): Added. Implementation adapted from JSStringCreateWithUTF8CString().

• API/JSStringRef.cpp: (JSStringCreateWithUTF8CString):
• API/JSClassRef.cpp: (OpaqueJSClass::OpaqueJSClass): Use UString::Rep::createFromUTF8().

File:

• trunk/JavaScriptCore/kjs/ustring.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/ustring.cpp

@@ -237 +237 @@
   // steal the single reference this Rep was created with
   return adoptRef(r);
+}
+
+PassRefPtr<UString::Rep> UString::Rep::createFromUTF8(const char* string)
+{
+    if (!string)
+        return &UString::Rep::null;
+
+    size_t length = strlen(string);
+    Vector<UChar, 1024> buffer(length);
+    UChar* p = buffer.data();
+    if (conversionOK != convertUTF8ToUTF16(&string, string + length, &p, p + length))
+        return &UString::Rep::null;
+
+    return UString::Rep::createCopying(buffer.data(), p - buffer.data());
 }