Size the buffer used for the metrics log text properly....

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
@@ skipping 387 matching lines @@
   unsent_ongoing_logs->Clear();
 }
 
 MetricsService::MetricsService()
     : recording_active_(false),
       reporting_active_(false),
       user_permits_upload_(false),
       server_permits_upload_(true),
       state_(INITIALIZED),
       pending_log_(NULL),
-      pending_log_text_(""),
+      pending_log_text_(),
       current_fetch_(NULL),
       current_log_(NULL),
       idle_since_last_transmission_(false),
       next_window_id_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(log_sender_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(state_saver_factory_(this)),
       logged_samples_(),
       interlog_duration_(TimeDelta::FromSeconds(kInitialInterlogDuration)),
       log_event_limit_(kInitialEventLimit),
       timer_pending_(false) {
@@ skipping 779 matching lines @@
     start = unsent_ongoing_logs_.size() - kMaxOngoingLogsPersisted;
   for (size_t i = start; i < unsent_ongoing_logs_.size(); ++i)
     unsent_ongoing_logs->Append(
         Value::CreateStringValue(unsent_ongoing_logs_[i]));
 }
 
 void MetricsService::PreparePendingLogText() {
   DCHECK(pending_log());
   if (!pending_log_text_.empty())
     return;
-  int original_size = pending_log_->GetEncodedLogSize();
-  pending_log_->GetEncodedLog(WriteInto(&pending_log_text_, original_size),
-                              original_size);
+  int text_size = pending_log_->GetEncodedLogSize();
+
+  // Leave room for the NUL terminator.
+  pending_log_->GetEncodedLog(WriteInto(&pending_log_text_, text_size + 1),
+                              text_size);
 }
 
 void MetricsService::PrepareFetchWithPendingLog() {
   DCHECK(pending_log());
   DCHECK(!current_fetch_.get());
   PreparePendingLogText();
   DCHECK(!pending_log_text_.empty());
 
   // Allow security conscious users to see all metrics logs that we send.
   LOG(INFO) << "METRICS LOG: " << pending_log_text_;
@@ skipping 711 matching lines @@
       L"." + key;
   prof_prefs->SetInteger(pref_key.c_str(), value);
 }
 
 static bool IsSingleThreaded() {
   static PlatformThreadId thread_id = 0;
   if (!thread_id)
     thread_id = PlatformThread::CurrentId();
   return PlatformThread::CurrentId() == thread_id;
 }