Don't double-escape in strings in the VM Service, and don't use \u0000 to determine the string lengt

runtime/vm/json_stream.cc

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "platform/assert.h"
 
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/json_stream.h"
 #include "vm/message.h"
@@ skipping 199 matching lines @@
 
 
 void JSONStream::PrintValue(const char* s) {
   PrintCommaIfNeeded();
   buffer_.AddChar('"');
   AddEscapedUTF8String(s);
   buffer_.AddChar('"');
 }
 
 
+void JSONStream::PrintValue(const char* s, intptr_t len) {
+  PrintCommaIfNeeded();
+  buffer_.AddChar('"');
+  AddEscapedUTF8String(s, len);
+  buffer_.AddChar('"');
+}
+
+
 void JSONStream::PrintValueNoEscape(const char* s) {
   PrintCommaIfNeeded();
   buffer_.Printf("%s", s);
 }
 
 
 void JSONStream::PrintfValue(const char* format, ...) {
   PrintCommaIfNeeded();
 
   va_list args;
@@ skipping 65 matching lines @@
   PrintValue(d);
 }
 
 
 void JSONStream::PrintProperty(const char* name, const char* s) {
   PrintPropertyName(name);
   PrintValue(s);
 }
 
 
+void JSONStream::PrintProperty(const char* name, const char* s, intptr_t len) {
+  PrintPropertyName(name);
+  PrintValue(s, len);
+}
+
+
 void JSONStream::PrintPropertyNoEscape(const char* name, const char* s) {
   PrintPropertyName(name);
   PrintValueNoEscape(s);
 }
 
 
 void JSONStream::PrintProperty(const char* name, const DebuggerEvent* event) {
   PrintPropertyName(name);
   PrintValue(event);
 }
@@ skipping 90 matching lines @@
   char ch = buffer[length-1];
   return (ch != '[') && (ch != '{') && (ch != ':') && (ch != ',');
 }
 
 
 void JSONStream::AddEscapedUTF8String(const char* s) {
   if (s == NULL) {
     return;
   }
   intptr_t len = strlen(s);
+  AddEscapedUTF8String(s, len);
+}
+
+
+void JSONStream::AddEscapedUTF8String(const char* s, intptr_t len) {
+  if (s == NULL) {
+    return;
+  }
   const uint8_t* s8 = reinterpret_cast<const uint8_t*>(s);
   intptr_t i = 0;
   for (; i < len; ) {
     // Extract next UTF8 character.
     int32_t ch = 0;
     int32_t ch_len = Utf8::Decode(&s8[i], len - i, &ch);
     ASSERT(ch_len != 0);
     buffer_.AddEscapedChar(ch);
     // Move i forward.
     i += ch_len;
@@ skipping 37 matching lines @@
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
   stream_->buffer_.AddChar('"');
   stream_->AddEscapedUTF8String(p);
   stream_->buffer_.AddChar('"');
   free(p);
 }
 
 }  // namespace dart