Preserve the contents of Dart strings with unmatched surrogate halfs by avoiding a UTF16 -> UTF8

runtime/vm/object.cc

Index: runtime/vm/object.cc
diff --git a/runtime/vm/object.cc b/runtime/vm/object.cc
index b1438cf392cecf20ee974b80c9b32be75c6a97f5..2c00c88376aed4beee60a3cce06c4097033d99c7 100644
--- a/runtime/vm/object.cc
+++ b/runtime/vm/object.cc
@@ -8525,14 +8525,14 @@ void Script::PrintJSONImpl(JSONStream* stream, bool ref) const {
   intptr_t lib_index = (lib.IsNull()) ? -1 : lib.index();
   jsobj.AddPropertyF("id", "libraries/%" Pd "/scripts/%s",
       lib_index, encoded_url.ToCString());
-  jsobj.AddProperty("name", name.ToCString());
+  jsobj.AddPropertyStr("name", name, name.Length());

[turnidge, 2014/09/11 16:35:12]

Omit 3rd parameter.

[rmacnak, 2014/09/11 17:57:53]

Removed.

   jsobj.AddProperty("kind", GetKindAsCString());
   if (ref) {
     return;
   }
   jsobj.AddProperty("owningLibrary", lib);
   const String& source = String::Handle(Source());
-  jsobj.AddProperty("source", source.ToCString());
+  jsobj.AddPropertyStr("source", source, source.Length());

[turnidge, 2014/09/11 16:35:12]

ditto

 
   // Print the line number table
   {
@@ -9812,8 +9812,8 @@ void Library::PrintJSONImpl(JSONStream* stream, bool ref) const {
   AddTypeProperties(&jsobj, "Library", JSONType(), ref);
   jsobj.AddPropertyF("id", "libraries/%" Pd "", id);
   jsobj.AddProperty("name", library_name);
-  const char* library_url = String::Handle(url()).ToCString();
-  jsobj.AddProperty("url", library_url);
+  const String& library_url = String::Handle(url());
+  jsobj.AddPropertyStr("url", library_url, library_url.Length());

[turnidge, 2014/09/11 16:35:12]

ditto

   if (ref) {
     return;
   }
@@ -17727,17 +17727,10 @@ RawString* String::SubString(const String& str,
 
 
 const char* String::ToCString() const {
-  intptr_t length;
-  return ToCString(&length);
-}
-
-
-const char* String::ToCString(intptr_t* length) const {
   if (IsOneByteString()) {
     // Quick conversion if OneByteString contains only ASCII characters.
     intptr_t len = Length();
     if (len == 0) {
-      *length = 0;
       return "";
     }
     Zone* zone = Isolate::Current()->current_zone();
@@ -17754,7 +17747,6 @@ const char* String::ToCString(intptr_t* length) const {
     }
     if (len > 0) {
       result[len] = 0;
-      *length = len;
       return reinterpret_cast<const char*>(result);
     }
   }
@@ -17763,33 +17755,10 @@ const char* String::ToCString(intptr_t* length) const {
   uint8_t* result = zone->Alloc<uint8_t>(len + 1);
   ToUTF8(result, len);
   result[len] = 0;
-  *length = len;
   return reinterpret_cast<const char*>(result);
 }
 
 
-const char* String::ToCStringTruncated(intptr_t max_len,
-                                       bool* did_truncate,
-                                       intptr_t* length) const {
-  if (Length() <= max_len) {
-    *did_truncate = false;
-    return ToCString(length);
-  }
-
-  intptr_t aligned_limit = max_len;
-  if (Utf16::IsLeadSurrogate(CharAt(max_len - 1))) {
-    // Don't let truncation split a surrogate pair.
-    aligned_limit--;
-  }
-  ASSERT(!Utf16::IsLeadSurrogate(CharAt(aligned_limit - 1)));
-
-  *did_truncate = true;
-  const String& truncated =
-      String::Handle(String::SubString(*this, 0, aligned_limit));
-  return truncated.ToCString(length);
-}
-
-
 void String::PrintJSONImpl(JSONStream* stream, bool ref) const {
   JSONObject jsobj(stream);
   if (raw() == Symbols::OptimizedOut().raw()) {
@@ -17807,17 +17776,13 @@ void String::PrintJSONImpl(JSONStream* stream, bool ref) const {
   const intptr_t id = ring->GetIdForObject(raw());
   jsobj.AddPropertyF("id", "objects/%" Pd "", id);
   if (ref) {
-    bool did_truncate = false;
-    intptr_t length = 0;
-    const char* cstr = ToCStringTruncated(128, &did_truncate, &length);
-    jsobj.AddProperty("valueAsString", cstr, length);
+    bool did_truncate = jsobj.AddPropertyStr("valueAsString", *this, 128);
     if (did_truncate) {
       jsobj.AddProperty("valueAsStringIsTruncated", did_truncate);
     }
   } else {
-    intptr_t length = 0;
-    const char* cstr = ToCString(&length);
-    jsobj.AddProperty("valueAsString", cstr, length);
+    bool did_truncate = jsobj.AddPropertyStr("valueAsString", *this);
+    ASSERT(!did_truncate);
   }
 }