diff options
Diffstat (limited to 'agent/tcf/services/tcf_elf.c')
| -rw-r--r-- | agent/tcf/services/tcf_elf.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c index c1ffeb0e..6e1ac357 100644 --- a/agent/tcf/services/tcf_elf.c +++ b/agent/tcf/services/tcf_elf.c @@ -1507,6 +1507,7 @@ static void search_regions(MemoryMap * map, ContextAddress addr0, ContextAddress } int elf_get_map(Context * ctx, ContextAddress addr0, ContextAddress addr1, MemoryMap * map) { + unsigned i; map->region_cnt = 0; ctx = context_get_group(ctx, CONTEXT_GROUP_PROCESS); #if ENABLE_MemoryMap @@ -1532,6 +1533,30 @@ int elf_get_map(Context * ctx, ContextAddress addr0, ContextAddress addr1, Memor } } #endif + for (i = 0; i + 1 < map->region_cnt; i++) { + MemoryRegion * m = map->regions + i; + MemoryRegion * r = m + 1; + if (m->file_size == m->size && m->file_offs < r->file_offs && m->file_offs + m->file_size > r->file_offs && + m->file_name != NULL && r->file_name != NULL && strcmp(m->file_name, r->file_name) == 0) { + /* Ambiguity: overlapping regions */ + ELF_File * elf = elf_open(r->file_name); + for (i = 0; i < elf->pheader_cnt; i++) { + ELF_PHeader * p = elf->pheaders + i; + if (p->type == PT_LOAD && p->offset == m->file_offs && p->mem_size < m->size) { + m->file_size = p->mem_size; + m->size = p->mem_size; + if (m->file_offs + m->size > r->file_offs && p->mem_size == p->file_size) { + uint64_t diff = m->file_offs + m->file_size - r->file_offs; + r->file_offs += diff; + r->file_size -= diff; + r->addr += diff; + r->size -= diff; + } + break; + } + } + } + } return 0; } |