minidump: Change the ownership model

minidump/minidump_simple_string_dictionary_writer.cc

 // Copyright 2014 The Crashpad Authors. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
 //
 //     http://www.apache.org/licenses/LICENSE-2.0
 //
 // Unless required by applicable law or agreed to in writing, software
 // distributed under the License is distributed on an "AS IS" BASIS,
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
 #include "minidump/minidump_simple_string_dictionary_writer.h"
 
 #include "base/logging.h"
+#include "base/stl_util.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
 
 MinidumpSimpleStringDictionaryEntryWriter::
     MinidumpSimpleStringDictionaryEntryWriter()
     : MinidumpWritable(), entry_(), key_(), value_() {
 }
 
@@ skipping 57 matching lines @@
   // MinidumpSimpleStringDictionary, and its children are responsible for
   // writing themselves.
   return true;
 }
 
 MinidumpSimpleStringDictionaryWriter::MinidumpSimpleStringDictionaryWriter()
     : MinidumpWritable(), simple_string_dictionary_base_(), entries_() {
 }
 
 MinidumpSimpleStringDictionaryWriter::~MinidumpSimpleStringDictionaryWriter() {
+  STLDeleteContainerPairSecondPointers(entries_.begin(), entries_.end());
 }
 
 void MinidumpSimpleStringDictionaryWriter::AddEntry(
-    MinidumpSimpleStringDictionaryEntryWriter* entry) {
+    scoped_ptr<MinidumpSimpleStringDictionaryEntryWriter> entry) {
   DCHECK_GE(state(), kStateMutable);
 
-  entries_[entry->Key()] = entry;
+  const std::string& key = entry->Key();
+  auto iterator = entries_.find(key);
+  if (iterator != entries_.end()) {
+    delete iterator->second;
+    iterator->second = entry.release();
+  } else {
+    entries_[key] = entry.release();
+  }
 }
 
 bool MinidumpSimpleStringDictionaryWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpWritable::Freeze()) {
     return false;
   }
 
   size_t entry_count = entries_.size();
@@ skipping 36 matching lines @@
   for (const auto& key_entry : entries_) {
     iov.iov_base = key_entry.second->MinidumpSimpleStringDictionaryEntry();
     iov.iov_len = sizeof(MinidumpSimpleStringDictionaryEntry);
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 }  // namespace crashpad