1 files changed, 10 insertions, 8 deletions

diff --git a/src/client/minidump_file_writer-inl.h b/src/client/minidump_file_writer-inl.h
index 4505b4f2..7c556a27 100644
--- a/src/client/minidump_file_writer-inl.h
+++ b/src/client/minidump_file_writer-inl.h
@@ -37,26 +37,27 @@
 #include <assert.h>
 
 #include "client/minidump_file_writer.h"
+#include "google_breakpad/common/minidump_size.h"
 
 namespace google_breakpad {
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::Allocate() {
   allocation_state_ = SINGLE_OBJECT;
-  return UntypedMDRVA::Allocate(sizeof(MDType));
+  return UntypedMDRVA::Allocate(minidump_size<MDType>::size());
 }
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::Allocate(size_t additional) {
   allocation_state_ = SINGLE_OBJECT;
-  return UntypedMDRVA::Allocate(sizeof(MDType) + additional);
+  return UntypedMDRVA::Allocate(minidump_size<MDType>::size() + additional);
 }
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::AllocateArray(size_t count) {
   assert(count);
   allocation_state_ = ARRAY;
-  return UntypedMDRVA::Allocate(sizeof(MDType) * count);
+  return UntypedMDRVA::Allocate(minidump_size<MDType>::size() * count);
 }
 
 template<typename MDType>
@@ -64,14 +65,14 @@ inline bool TypedMDRVA<MDType>::AllocateObjectAndArray(unsigned int count,
                                                        size_t size) {
   assert(count && size);
   allocation_state_ = SINGLE_OBJECT_WITH_ARRAY;
-  return UntypedMDRVA::Allocate(sizeof(MDType) + count * size);
+  return UntypedMDRVA::Allocate(minidump_size<MDType>::size() + count * size);
 }
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::CopyIndex(unsigned int index, MDType *item) {
   assert(allocation_state_ == ARRAY);
-  return writer_->Copy(position_ + index * sizeof(MDType), item,
-                       sizeof(MDType));
+  return writer_->Copy(position_ + index * minidump_size<MDType>::size(), item,
+                       minidump_size<MDType>::size());
 }
 
 template<typename MDType>
@@ -79,12 +80,13 @@ inline bool TypedMDRVA<MDType>::CopyIndexAfterObject(unsigned int index,
                                                      const void *src, 
                                                      size_t size) {
   assert(allocation_state_ == SINGLE_OBJECT_WITH_ARRAY);
-  return writer_->Copy(position_ + sizeof(MDType) + index * size, src, size);
+  return writer_->Copy(position_ + minidump_size<MDType>::size() + index * size,
+                       src, size);
 }
 
 template<typename MDType>
 inline bool TypedMDRVA<MDType>::Flush() {
-  return writer_->Copy(position_, &data_, sizeof(MDType));
+  return writer_->Copy(position_, &data_, minidump_size<MDType>::size());
 }
 
 }  // namespace google_breakpad