Ensure Linux minidump writer flushes minidump header early.

If the Linux minidump writer crashes while writing a dump, the dump
might contain some useful information, but the header will be empty
because TypedMDRVA's destructor flushes the data, and the header var
doesn't go out of scope until the end of the `Dump` method. This
fixes that problem by putting the header in a shorter block scope.

We've seen this problem in some Android dumps in the wild, like:
https://crash-stats.mozilla.com/report/index/cef5b777-02d1-43c2-bf40-133ab2160209

R=thestig@chromium.org
BUG=https://bugzilla.mozilla.org/show_bug.cgi?id=1247978

Review URL: https://codereview.chromium.org/1696573003 .
This commit is contained in:
Ted Mielczarek 2016-02-12 15:50:16 -05:00
parent d7c0bd0624
commit e132514d80

View file

@ -168,19 +168,26 @@ class MinidumpWriter {
// of stream which we write. // of stream which we write.
unsigned kNumWriters = 13; unsigned kNumWriters = 13;
TypedMDRVA<MDRawHeader> header(&minidump_writer_);
TypedMDRVA<MDRawDirectory> dir(&minidump_writer_); TypedMDRVA<MDRawDirectory> dir(&minidump_writer_);
if (!header.Allocate()) {
return false; // Ensure the header gets flushed, as that happens in the destructor.
if (!dir.AllocateArray(kNumWriters)) // If a crash occurs somewhere below, at least the header will be
return false; // intact.
my_memset(header.get(), 0, sizeof(MDRawHeader)); TypedMDRVA<MDRawHeader> header(&minidump_writer_);
if (!header.Allocate())
return false;
header.get()->signature = MD_HEADER_SIGNATURE; if (!dir.AllocateArray(kNumWriters))
header.get()->version = MD_HEADER_VERSION; return false;
header.get()->time_date_stamp = time(NULL);
header.get()->stream_count = kNumWriters; my_memset(header.get(), 0, sizeof(MDRawHeader));
header.get()->stream_directory_rva = dir.position();
header.get()->signature = MD_HEADER_SIGNATURE;
header.get()->version = MD_HEADER_VERSION;
header.get()->time_date_stamp = time(NULL);
header.get()->stream_count = kNumWriters;
header.get()->stream_directory_rva = dir.position();
}
unsigned dir_index = 0; unsigned dir_index = 0;
MDRawDirectory dirent; MDRawDirectory dirent;