Changeset 27810 in webkit for trunk/JavaScriptCore/API/JSStringRef.cpp

Timestamp:

Nov 14, 2007, 9:59:40 PM (18 years ago)

Author:

[email protected]

Message:

Reviewed by Darin.

​http://bugs.webkit.org/show_bug.cgi?id=15982
Improve JSString UTF-8 decoding

• API/JSStringRef.cpp: (JSStringCreateWithUTF8CString): Use strict decoding, return 0 on error.

• wtf/unicode/UTF8.cpp: (WTF::Unicode::convertUTF16ToUTF8): (WTF::Unicode::convertUTF8ToUTF16):
• wtf/unicode/UTF8.h: Made these function names start with a lower case letter.

• kjs/ustring.cpp: (KJS::UString::UTF8String): Updated for the above renaming.

• bindings/c/c_utility.cpp: (KJS::Bindings::convertUTF8ToUTF16WithLatin1Fallback): Renamed to highlight the difference from convertUTF8ToUTF16 in wtf/unicode. (KJS::Bindings::convertNPStringToUTF16): Updated for the above renaming. (KJS::Bindings::identifierFromNPIdentifier): Ditto.
• bindings/c/c_utility.h: Made convertUTF8ToUTF16WithLatin1Fallback() a file static.

File:

• trunk/JavaScriptCore/API/JSStringRef.cpp (modified) (1 diff)

trunk/JavaScriptCore/API/JSStringRef.cpp

@@ -55 +55 @@
     Vector< ::UChar, 1024> buffer(length);
     ::UChar* p = buffer.data();
-    ConvertUTF8ToUTF16(&string, string + length, &p, p + length, false);
+    if (conversionOK != convertUTF8ToUTF16(&string, string + length, &p, p + length))
+        return 0;
 
     return toRef(UString(reinterpret_cast<KJS::UChar*>(buffer.data()), p - buffer.data()).rep()->ref());