diff options
| -rw-r--r-- | agent/tcf/services/tcf_elf.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/agent/tcf/services/tcf_elf.c b/agent/tcf/services/tcf_elf.c index 90292cc1..e6a859f1 100644 --- a/agent/tcf/services/tcf_elf.c +++ b/agent/tcf/services/tcf_elf.c @@ -1824,11 +1824,14 @@ ContextAddress elf_run_time_address_in_region(Context * ctx, MemoryRegion * r, E } for (i = 0; i < mem_file->pheader_cnt; i++) { ELF_PHeader * p = mem_file->pheaders + i; - if (!is_p_header_region(mem_file, p, r)) continue; - if (addr < p->address || addr >= p->address + p->mem_size) continue; - rt = (ContextAddress)(addr - p->address + p->offset - r->file_offs + r->addr); - if (rt < r->addr || rt > r->addr + r->size - 1) continue; - return rt; + if (p->type == PT_LOAD) { + U8_T p_addr = i < file->pheader_cnt ? file->pheaders[i].address : p->address; + if (addr < p_addr || addr >= p_addr + p->mem_size) continue; + if (!is_p_header_region(mem_file, p, r)) continue; + rt = (ContextAddress)(addr - p_addr + p->offset - r->file_offs + r->addr); + if (rt < r->addr || rt > r->addr + r->size - 1) continue; + return rt; + } } } else if (sec != NULL) { |