minidump: Be consistent about setting the fields of WritableIoVec

minidump/minidump_module_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 136 matching lines @@
     FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   const size_t base_length = offsetof(typeof(image_debug_misc_), Data);
 
   WritableIoVec iov;
   iov.iov_base = &image_debug_misc_;
   iov.iov_len = base_length;
   std::vector<WritableIoVec> iovecs(1, iov);
 
-  iov.iov_len = image_debug_misc_.Length - base_length;
   if (!image_debug_misc_.Unicode) {
     DCHECK(data_utf16_.empty());
     iov.iov_base = &data_[0];
   } else {
     DCHECK(data_.empty());
     iov.iov_base = &data_utf16_[0];
   }
+  iov.iov_len = image_debug_misc_.Length - base_length;
   iovecs.push_back(iov);
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 MinidumpModuleWriter::MinidumpModuleWriter()
     : MinidumpWritable(),
       module_(),
       name_(),
       codeview_record_(nullptr),
@@ skipping 176 matching lines @@
 
 bool MinidumpModuleListWriter::WriteObject(FileWriterInterface* file_writer) {
   DCHECK_EQ(state(), kStateWritable);
 
   WritableIoVec iov;
   iov.iov_base = &module_list_base_;
   iov.iov_len = sizeof(module_list_base_);
   std::vector<WritableIoVec> iovecs(1, iov);
 
   for (const MinidumpModuleWriter* module : modules_) {
+    iov.iov_base = module->MinidumpModule();
     iov.iov_len = sizeof(MINIDUMP_MODULE);
-    iov.iov_base = module->MinidumpModule();
     iovecs.push_back(iov);
   }
 
   return file_writer->WriteIoVec(&iovecs);
 }
 
 MinidumpStreamType MinidumpModuleListWriter::StreamType() const {
   return kMinidumpStreamTypeModuleList;
 }
 
 }  // namespace crashpad