Account for '\0' string terminator in allocated buffers.

runtime/vm/object.cc

 // Copyright (c) 2012, 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 "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 3918 matching lines @@
     ASSERT(!library.IsNull());
     const char* library_name = String::Handle(library.url()).ToCString();
     ASSERT(library_name != NULL);
     const char* lib_class_format =
         (library_name[0] == '\0') ? "%s%s_" : "%s_%s_";
     reserve_len +=
         OS::SNPrint(NULL, 0, lib_class_format, library_name, class_name);
     ASSERT(chars != NULL);
     *chars = Isolate::Current()->current_zone()->Alloc<char>(reserve_len + 1);
     written = OS::SNPrint(
-        *chars, reserve_len, lib_class_format, library_name, class_name);
+        *chars, reserve_len + 1, lib_class_format, library_name, class_name);
   } else {
     written = ConstructFunctionFullyQualifiedCString(parent,
                                                      chars,
                                                      reserve_len);
   }
   ASSERT(*chars != NULL);
   char* next = *chars + written;
   written += OS::SNPrint(next, reserve_len + 1, function_format, name);
   // Replace ":" with "_".
   while (true) {
@@ skipping 2976 matching lines @@
 intptr_t DeoptInfo::Instruction(intptr_t index) const {
   return *(EntryAddr(index, kInstruction));
 }
 
 
 const char* DeoptInfo::ToCString() const {
   if (Length() == 0) {
     return "No DeoptInfo";
   }
   // First compute the buffer size required.
-  intptr_t len = 0;
+  intptr_t len = 1;

[srdjan, 2012/08/06 16:07:19]

Add comment: // Trailing '\0'.

[Kevin Millikin (Google), 2012/08/07 10:07:59]

Done.

   for (intptr_t i = 0; i < Length(); i++) {
     len += OS::SNPrint(NULL, 0, "[%d(%d):%d]",
-        Instruction(i), FromIndex(i), i);
+                       Instruction(i), FromIndex(i), i);
   }
   // Allocate the buffer.
-  char* buffer = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
+  char* buffer = Isolate::Current()->current_zone()->Alloc<char>(len);
   // Layout the fields in the buffer.
   intptr_t index = 0;
   for (intptr_t i = 0; i < Length(); i++) {
     index += OS::SNPrint((buffer + index),
                          (len - index),
                          "[%d(%d):%d]",
                          Instruction(i),
                          FromIndex(i),
                          i);
   }
@@ skipping 259 matching lines @@
         (descriptors.DescriptorKind(i) == PcDescriptors::kDeopt)) {
       return descriptors.PC(i);
     }
   }
   return 0;
 }
 
 
 const char* Code::ToCString() const {
   const char* kFormat = "Code entry:0x%d";
-  intptr_t len = OS::SNPrint(NULL, 0, kFormat, EntryPoint());
+  intptr_t len = OS::SNPrint(NULL, 0, kFormat, EntryPoint()) + 1;
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len);
   OS::SNPrint(chars, len, kFormat, EntryPoint());
   return chars;
 }
 
 
 uword Code::GetPatchCodePc() const {
   const PcDescriptors& descriptors = PcDescriptors::Handle(pc_descriptors());
   for (intptr_t i = 0; i < descriptors.Length(); i++) {
     if (descriptors.DescriptorKind(i) == PcDescriptors::kPatchCode) {
@@ skipping 3813 matching lines @@
 const char* JSRegExp::ToCString() const {
   const String& str = String::Handle(pattern());
   const char* format = "JSRegExp: pattern=%s flags=%s";
   intptr_t len = OS::SNPrint(NULL, 0, format, str.ToCString(), Flags());
   char* chars = Isolate::Current()->current_zone()->Alloc<char>(len + 1);
   OS::SNPrint(chars, (len + 1), format, str.ToCString(), Flags());
   return chars;
 }
 
 }  // namespace dart