openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am becea6e0: Merge "Fix ELF header parser bug." into jb-mr1.1-dev 

* commit 'becea6e04e7f7cca3eaa514d5749d315c6213b25':
  Fix ELF header parser bug.
This commit is contained in:
Ben Cheng 2012-12-11 10:56:32 -08:00 committed by Android Git Automerger
parent e1f0bd8324 becea6e04e
commit 2353a44eee
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcorkscrew/arch-arm/ptrace-arm.c
View File

@ -29,12 +29,15 @@
static void load_exidx_header(pid_t pid, map_info_t* mi,
uintptr_t* out_exidx_start, size_t* out_exidx_size) {
uint32_t elf_phoff;
uint32_t elf_phentsize_phnum;
uint32_t elf_phentsize_ehsize;
uint32_t elf_shentsize_phnum;
if (try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phoff), &elf_phoff)
&& try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_ehsize),
&elf_phentsize_ehsize)
&& try_get_word_ptrace(pid, mi->start + offsetof(Elf32_Ehdr, e_phnum),
&elf_phentsize_phnum)) {
uint32_t elf_phentsize = elf_phentsize_phnum >> 16;
uint32_t elf_phnum = elf_phentsize_phnum & 0xffff;
&elf_shentsize_phnum)) {
uint32_t elf_phentsize = elf_phentsize_ehsize >> 16;
uint32_t elf_phnum = elf_shentsize_phnum & 0xffff;
for (uint32_t i = 0; i < elf_phnum; i++) {
uintptr_t elf_phdr = mi->start + elf_phoff + i * elf_phentsize;
uint32_t elf_phdr_type;