win: convert MinidumpSimpleStringDictionaryWriter to scoped_ptr

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,
@@ skipping 73 matching lines @@
   DCHECK_EQ(state(), kStateWritable);
 
   // This object doesn’t directly write anything itself. Its
   // MinidumpSimpleStringDictionaryEntry is written by its parent as part of a
   // MinidumpSimpleStringDictionary, and its children are responsible for
   // writing themselves.
   return true;
 }
 
 MinidumpSimpleStringDictionaryWriter::MinidumpSimpleStringDictionaryWriter()
-    : MinidumpWritable(), entries_(), simple_string_dictionary_base_() {
+    : MinidumpWritable(),
+      entries_(),
+      simple_string_dictionary_base_(new MinidumpSimpleStringDictionary()) {
 }
 
 MinidumpSimpleStringDictionaryWriter::~MinidumpSimpleStringDictionaryWriter() {
   STLDeleteContainerPairSecondPointers(entries_.begin(), entries_.end());
 }
 
 void MinidumpSimpleStringDictionaryWriter::InitializeFromMap(
     const std::map<std::string, std::string>& map) {
   DCHECK_EQ(state(), kStateMutable);
   DCHECK(entries_.empty());
@@ skipping 25 matching lines @@
 }
 
 bool MinidumpSimpleStringDictionaryWriter::Freeze() {
   DCHECK_EQ(state(), kStateMutable);
 
   if (!MinidumpWritable::Freeze()) {
     return false;
   }
 
   size_t entry_count = entries_.size();
-  if (!AssignIfInRange(&simple_string_dictionary_base_.count, entry_count)) {
+  if (!AssignIfInRange(&simple_string_dictionary_base_->count, entry_count)) {
     LOG(ERROR) << "entry_count " << entry_count << " out of range";
     return false;
   }
 
   return true;
 }
 
 size_t MinidumpSimpleStringDictionaryWriter::SizeOfObject() {
   DCHECK_GE(state(), kStateFrozen);
 
-  return sizeof(simple_string_dictionary_base_) +
+  return sizeof(*simple_string_dictionary_base_) +
          entries_.size() * sizeof(MinidumpSimpleStringDictionaryEntry);
 }
 
 std::vector<internal::MinidumpWritable*>
 MinidumpSimpleStringDictionaryWriter::Children() {
   DCHECK_GE(state(), kStateMutable);
 
   std::vector<MinidumpWritable*> children;
   for (const auto& key_entry : entries_) {
     children.push_back(key_entry.second);
   }
 
   return children;
 }
 
 bool MinidumpSimpleStringDictionaryWriter::WriteObject(
     FileWriterInterface* file_writer) {
   DCHECK_GE(state(), kStateWritable);
 
   WritableIoVec iov;
-  iov.iov_base = &simple_string_dictionary_base_;
-  iov.iov_len = sizeof(simple_string_dictionary_base_);
+  iov.iov_base = simple_string_dictionary_base_.get();
+  iov.iov_len = sizeof(*simple_string_dictionary_base_);
   std::vector<WritableIoVec> iovecs(1, iov);
 
   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