aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTao Bai <michaelbai@chromium.org>2016-05-13 12:45:44 -0400
committerMark Mentovai <mark@chromium.org>2016-05-13 12:45:44 -0400
commita875991e73835d2ad3ba277b53b8121fd1ee06ab (patch)
tree837a11412c253c1cb0e73c7276fa71a1adfcf842
parentReplaced glibc version of elf.h with musl version of elf.h. (diff)
downloadbreakpad-a875991e73835d2ad3ba277b53b8121fd1ee06ab.tar.xz
Revert "Write adjusted range back to module"
This is no right fix, we shouldn't allow module overlap. This reverts commit 4f417c8c0ffceb6c2516c6ef00cd91ca5746d852. BUG=606972 R=mark@chromium.org Review URL: https://codereview.chromium.org/1976683004 . Patch from Tao Bai <michaelbai@chromium.org>.
-rw-r--r--src/google_breakpad/processor/minidump.h5
-rw-r--r--src/processor/minidump.cc8
2 files changed, 0 insertions, 13 deletions
diff --git a/src/google_breakpad/processor/minidump.h b/src/google_breakpad/processor/minidump.h
index 5ec2d148..2b5025e4 100644
--- a/src/google_breakpad/processor/minidump.h
+++ b/src/google_breakpad/processor/minidump.h
@@ -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);
diff --git a/src/processor/minidump.cc b/src/processor/minidump.cc
index c026559b..84f013d0 100644
--- a/src/processor/minidump.cc
+++ b/src/processor/minidump.cc
@@ -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 << ", " <<