minidump: Change the ownership model

minidump/minidump_memory_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_memory_writer.h"
 
 #include "base/logging.h"
 #include "util/file/file_writer.h"
 #include "util/numeric/safe_assignment.h"
 
 namespace crashpad {
 
+MinidumpMemoryWriter::~MinidumpMemoryWriter() {
+}
+
 const MINIDUMP_MEMORY_DESCRIPTOR*
 MinidumpMemoryWriter::MinidumpMemoryDescriptor() const {
   DCHECK_EQ(state(), kStateWritable);
 
   return &memory_descriptor_;
 }
 
 void MinidumpMemoryWriter::RegisterMemoryDescriptor(
     MINIDUMP_MEMORY_DESCRIPTOR* memory_descriptor) {
   DCHECK_LE(state(), kStateFrozen);
@@ skipping 66 matching lines @@
 MinidumpMemoryListWriter::MinidumpMemoryListWriter()
     : MinidumpStreamWriter(),
       memory_list_base_(),
       memory_writers_(),
       children_() {
 }
 
 MinidumpMemoryListWriter::~MinidumpMemoryListWriter() {
 }
 
-void MinidumpMemoryListWriter::AddMemory(MinidumpMemoryWriter* memory_writer) {
+void MinidumpMemoryListWriter::AddMemory(
+    scoped_ptr<MinidumpMemoryWriter> memory_writer) {
   DCHECK_EQ(state(), kStateMutable);
 
-  children_.push_back(memory_writer);
-  AddExtraMemory(memory_writer);
+  AddExtraMemory(memory_writer.get());
+  children_.push_back(memory_writer.release());
 }
 
 void MinidumpMemoryListWriter::AddExtraMemory(
     MinidumpMemoryWriter* memory_writer) {
   DCHECK_EQ(state(), kStateMutable);
 
   memory_writers_.push_back(memory_writer);
 }
 
 bool MinidumpMemoryListWriter::Freeze() {
@@ skipping 21 matching lines @@
   DCHECK_LE(children_.size(), memory_writers_.size());
 
   return sizeof(memory_list_base_) +
          memory_writers_.size() * sizeof(MINIDUMP_MEMORY_DESCRIPTOR);
 }
 
 std::vector<internal::MinidumpWritable*> MinidumpMemoryListWriter::Children() {
   DCHECK_GE(state(), kStateFrozen);
   DCHECK_LE(children_.size(), memory_writers_.size());
 
-  return children_;
+  std::vector<MinidumpWritable*> children;
+  for (MinidumpMemoryWriter* child : children_) {
+    children.push_back(child);
+  }
+
+  return children;
 }
 
 bool MinidumpMemoryListWriter::WriteObject(FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   WritableIoVec iov;
   iov.iov_base = &memory_list_base_;
   iov.iov_len = sizeof(memory_list_base_);
   std::vector<WritableIoVec> iovecs(1, iov);
 
   for (const MinidumpMemoryWriter* memory_writer : memory_writers_) {
     iov.iov_base = memory_writer->MinidumpMemoryDescriptor();
     iov.iov_len = sizeof(MINIDUMP_MEMORY_DESCRIPTOR);
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 MinidumpStreamType MinidumpMemoryListWriter::StreamType() const {
   return kMinidumpStreamTypeMemoryList;
 }
 
 }  // namespace crashpad