Escape strings when writing to JSON.

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/object.h"
 #include "vm/json_stream.h"
 
 
 namespace dart {
@@ skipping 67 matching lines @@
 
 
 void JSONStream::PrintValue(double d) {
   PrintCommaIfNeeded();
   buffer_->Printf("%f", d);
 }
 
 
 void JSONStream::PrintValue(const char* s) {
   PrintCommaIfNeeded();
-  buffer_->Printf("\"%s\"", s);
+  buffer_->AddChar('"');
+  buffer_->AddEscapedString(s);
+  buffer_->AddChar('"');
 }
 
 
 void JSONStream::PrintfValue(const char* format, ...) {
   PrintCommaIfNeeded();
 
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
-  buffer_->Printf("\"%s\"", p);
+  buffer_->AddChar('"');
+  buffer_->AddEscapedString(p);
+  buffer_->AddChar('"');
   free(p);
 }
 
 
 void JSONStream::PrintValue(const Object& o, bool ref) {
   PrintCommaIfNeeded();
   o.PrintToJSONStream(this, ref);
 }
 
 
@@ skipping 25 matching lines @@
   PrintPropertyName(name);
   va_list args;
   va_start(args, format);
   intptr_t len = OS::VSNPrint(NULL, 0, format, args);
   va_end(args);
   char* p = reinterpret_cast<char*>(malloc(len+1));
   va_start(args, format);
   intptr_t len2 = OS::VSNPrint(p, len+1, format, args);
   va_end(args);
   ASSERT(len == len2);
-  buffer_->Printf("\"%s\"", p);
+  buffer_->AddChar('"');
+  buffer_->AddEscapedString(p);
+  buffer_->AddChar('"');
   free(p);
 }
 
 
 void JSONStream::SetArguments(const char** arguments, intptr_t num_arguments) {
   arguments_ = arguments;
   num_arguments_ = num_arguments;
 }
 
 
 void JSONStream::SetOptions(const char** option_keys,
                             const char** option_values,
                             intptr_t num_options) {
   option_keys_ = option_keys;
   option_values_ = option_values;
   num_options_ = num_options;
 }
 
 
 void JSONStream::PrintProperty(const char* name, const Object& o, bool ref) {
   PrintPropertyName(name);
   PrintValue(o, ref);
 }
 
 
 void JSONStream::PrintPropertyName(const char* name) {
   ASSERT(name != NULL);
   PrintCommaIfNeeded();
-  buffer_->Printf("\"%s\":", name);
+  buffer_->AddChar('"');
+  buffer_->AddEscapedString(name);
+  buffer_->AddChar('"');
+  buffer_->AddChar(':');
 }
 
 
 void JSONStream::PrintCommaIfNeeded() {
   if (NeedComma()) {
     buffer_->AddChar(',');
   }
 }
 
 
 bool JSONStream::NeedComma() {
   const char* buffer = buffer_->buf();
   intptr_t length = buffer_->length();
   if (length == 0) {
     return false;
   }
   char ch = buffer[length-1];
   return ch != '[' && ch != '{' && ch != ':' && ch != ',';
 }
 
 }  // namespace dart