Linux Breakpad: Use MD_MODULE_SIZE in place of sizeof(MDRawModule)....

breakpad/linux/minidump_writer.cc

 // Copyright (c) 2009, Google Inc.
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 // notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
@@ skipping 482 matching lines @@
     const unsigned num_mappings = dumper_.mappings().size();
     unsigned num_output_mappings = 0;
 
     for (unsigned i = 0; i < dumper_.mappings().size(); ++i) {
       const MappingInfo& mapping = *dumper_.mappings()[i];
       if (ShouldIncludeMapping(mapping))
         num_output_mappings++;
     }
 
     TypedMDRVA<uint32_t> list(&minidump_writer_);
-    if (!list.AllocateObjectAndArray(num_output_mappings, sizeof(MDRawModule)))
+    if (!list.AllocateObjectAndArray(num_output_mappings, MD_MODULE_SIZE))
       return false;
 
     dirent->stream_type = MD_MODULE_LIST_STREAM;
     dirent->location = list.location();
     *list.get() = num_output_mappings;
 
     for (unsigned i = 0, j = 0; i < num_mappings; ++i) {
       const MappingInfo& mapping = *dumper_.mappings()[i];
       if (!ShouldIncludeMapping(mapping))
         continue;
 
       MDRawModule mod;
-      my_memset(&mod, 0, sizeof(mod));
+      my_memset(&mod, 0, MD_MODULE_SIZE);
       mod.base_of_image = mapping.start_addr;
       mod.size_of_image = mapping.size;
       const size_t filepath_len = my_strlen(mapping.name);
 
       // Figure out file name from path
       const char* filename_ptr = mapping.name + filepath_len - 1;
       while (filename_ptr >= mapping.name) {
         if (*filename_ptr == '/')
           break;
         filename_ptr--;
@@ skipping 35 matching lines @@
       memcpy(cv_ptr, filename_ptr, filename_len + 1);
       cv.Copy(cv_buf, MDCVInfoPDB70_minsize + filename_len + 1);
 
       mod.cv_record = cv.location();
 
       MDLocationDescriptor ld;
       if (!minidump_writer_.WriteString(mapping.name, filepath_len, &ld))
         return false;
       mod.module_name_rva = ld.rva;
 
-      list.CopyIndexAfterObject(j++, &mod, sizeof(mod));
+      list.CopyIndexAfterObject(j++, &mod, MD_MODULE_SIZE);
     }
 
     return true;
   }
 
   bool WriteExceptionStream(MDRawDirectory* dirent) {
     TypedMDRVA<MDRawExceptionStream> exc(&minidump_writer_);
     if (!exc.Allocate())
       return false;
     my_memset(exc.get(), 0, sizeof(MDRawExceptionStream));
@@ skipping 270 matching lines @@
     return false;
   const ExceptionHandler::CrashContext* context =
       reinterpret_cast<const ExceptionHandler::CrashContext*>(blob);
   MinidumpWriter writer(filename, crashing_process, context);
   if (!writer.Init())
     return false;
   return writer.Dump();
 }
 
 }  // namespace google_breakpad