From 8915f7be39448d9257b6da3ad0233944d1d9a92a Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Tue, 8 Mar 2016 08:46:00 +0000 Subject: Don't merge the mappings if their exec bit are different. BUG=585534 R=primiano@chromium.org Review URL: https://codereview.chromium.org/1750033002 . --- src/client/linux/minidump_writer/linux_dumper.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/client/linux/minidump_writer') 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; -- cgit v1.2.1