diff options
| author | Primiano Tucci <primiano@google.com> | 2016-03-08 08:46:00 +0000 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2016-03-08 08:46:00 +0000 |
| commit | 8915f7be39448d9257b6da3ad0233944d1d9a92a (patch) | |
| tree | 409e46ffb180556441356ab445680515aa06cbcd /src/client/linux | |
| parent | Add an optional root prefix to Linux dumpers (diff) | |
| download | breakpad-8915f7be39448d9257b6da3ad0233944d1d9a92a.tar.xz | |
Don't merge the mappings if their exec bit are different.
BUG=585534
R=primiano@chromium.org
Review URL: https://codereview.chromium.org/1750033002 .
Diffstat (limited to 'src/client/linux')
| -rw-r--r-- | src/client/linux/minidump_writer/linux_dumper.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc index 8d4df9ad..060e6c7c 100644 --- a/src/client/linux/minidump_writer/linux_dumper.cc +++ b/src/client/linux/minidump_writer/linux_dumper.cc @@ -351,7 +351,8 @@ bool LinuxDumper::EnumerateMappings() { MappingInfo* module = mappings_.back(); if ((start_addr == module->start_addr + module->size) && (my_strlen(name) == my_strlen(module->name)) && - (my_strncmp(name, module->name, my_strlen(name)) == 0)) { + (my_strncmp(name, module->name, my_strlen(name)) == 0) && + (exec == module->exec)) { module->size = end_addr - module->start_addr; line_reader->PopLine(line_len); continue; |