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

Revert "Write adjusted range back to module"

Browse source 
This is no right fix, we shouldn't allow module overlap.

This reverts commit 4f417c8c0f.

BUG=606972
R=mark@chromium.org

Review URL: https://codereview.chromium.org/1976683004 .

Patch from Tao Bai <michaelbai@chromium.org>.
This commit is contained in:
Tao Bai 2016-05-13 12:45:44 -04:00 committed by Mark Mentovai
parent a84d4fc426
commit a875991e73
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/google_breakpad/processor/minidump.h
View file

@ -382,11 +382,6 @@ class MinidumpModule : public MinidumpObject,
const MDRawModule* module() const { return valid_ ? &module_ : NULL; }
// This method is intented to handle the case on Android where the module
// could overlap with ashmem, and is not supposed to be used in anywhere
// else.
void set_base_address_and_size(uint64_t base_address, uint64_t size);
// CodeModule implementation
virtual uint64_t base_address() const {
return valid_ ? module_.base_of_image : static_cast<uint64_t>(-1);

8
src/processor/minidump.cc
View file

@ -2327,13 +2327,6 @@ const MDImageDebugMisc* MinidumpModule::GetMiscRecord(uint32_t* size) {
return reinterpret_cast<MDImageDebugMisc*>(&(*misc_record_)[0]);
}
void MinidumpModule::set_base_address_and_size(uint64_t base_address,
uint64_t size) {
if (valid_) {
module_.base_of_image = base_address;
module_.size_of_image = size;
}
}
void MinidumpModule::Print() {
if (!valid_) {
@ -2642,7 +2635,6 @@ bool MinidumpModuleList::Read(uint32_t expected_size) {
HexString(module_size) << ", after adjusting";
return false;
}
module->set_base_address_and_size(base_address, module_size);
} else {
BPLOG(ERROR) << "MinidumpModuleList could not store module " <<
module_index << "/" << module_count << ", " <<