suyu/breakpad
26
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add address mask to MinidumpCrashpadInfo.

Browse source 
Support reading both old and new crashpad_info structs.

Change-Id: I780792988671683fedfbb5122fe8a14bf0a8b793
Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/3982824
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Justin Cohen 2023-01-20 13:30:35 -05:00 committed by Justin Cohen
parent b024566c44
commit fc1a202855
2 changed files with 45 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/google_breakpad/common/minidump_format.h
View file

@ -1118,6 +1118,8 @@ typedef struct {
MDGUID client_id;
MDLocationDescriptor simple_annotations; /* MDRawSimpleStringDictionary */
MDLocationDescriptor module_list; /* MDRawModuleCrashpadInfoList */
uint32_t reserved;
uint64_t address_mask;
} MDRawCrashpadInfo;
#if defined(_MSC_VER)

47
src/processor/minidump.cc
View file

@ -5267,16 +5267,52 @@ MinidumpCrashpadInfo::MinidumpCrashpadInfo(Minidump* minidump)
bool MinidumpCrashpadInfo::Read(uint32_t expected_size) {
valid_ = false;
if (expected_size != sizeof(crashpad_info_)) {
BPLOG(ERROR) << "MinidumpCrashpadInfo size mismatch, " << expected_size <<
" != " << sizeof(crashpad_info_);
// Support old minidumps that do not implement newer crashpad_info_
// fields, currently limited to the address mask.
static_assert(sizeof(crashpad_info_) == 64,
"Updated ::Read for new crashpad_info field.");
constexpr size_t crashpad_info_min_size =
offsetof(decltype(crashpad_info_), reserved);
if (expected_size < crashpad_info_min_size) {
BPLOG(ERROR) << "MinidumpCrashpadInfo size mismatch, " << expected_size
<< " < " << crashpad_info_min_size;
return false;
}
if (!minidump_->ReadBytes(&crashpad_info_, sizeof(crashpad_info_))) {
if (!minidump_->ReadBytes(&crashpad_info_, crashpad_info_min_size)) {
BPLOG(ERROR) << "MinidumpCrashpadInfo cannot read Crashpad info";
return false;
}
expected_size -= crashpad_info_min_size;
// Read `reserved` if available.
size_t crashpad_reserved_size = sizeof(crashpad_info_.reserved);
if (expected_size >= crashpad_reserved_size) {
if (!minidump_->ReadBytes(
&crashpad_info_.reserved,
crashpad_reserved_size)) {
BPLOG(ERROR) << "MinidumpCrashpadInfo cannot read reserved";
return false;
}
expected_size -= crashpad_reserved_size;
} else {
crashpad_info_.reserved = 0;
}
// Read `address_mask` if available.
size_t crashpad_address_mask_size = sizeof(crashpad_info_.address_mask);
if (expected_size >= crashpad_address_mask_size) {
if (!minidump_->ReadBytes(
&crashpad_info_.address_mask,
crashpad_address_mask_size)) {
BPLOG(ERROR) << "MinidumpCrashpadInfo cannot read address mask";
return false;
}
expected_size -= crashpad_address_mask_size;
} else {
crashpad_info_.address_mask = 0;
}
if (minidump_->swap()) {
Swap(&crashpad_info_.version);
@ -5284,6 +5320,8 @@ bool MinidumpCrashpadInfo::Read(uint32_t expected_size) {
Swap(&crashpad_info_.client_id);
Swap(&crashpad_info_.simple_annotations);
Swap(&crashpad_info_.module_list);
Swap(&crashpad_info_.reserved);
Swap(&crashpad_info_.address_mask);
}
if (crashpad_info_.simple_annotations.data_size) {
@ -5420,6 +5458,7 @@ void MinidumpCrashpadInfo::Print() {
printf(" module_list[%d].simple_annotations[\"%s\"] = %s\n",
module_index, annot.first.c_str(), annot.second.c_str());
}
printf(" address_mask = %llu\n", crashpad_info_.address_mask);
}
printf("\n");