generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "linker: Fix the computation of si->base"

Browse Source
This commit is contained in:
Nick Kralevich 2012-05-15 15:10:00 -07:00 committed by android code review
commit 1adc7c0389
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linker/linker.c
View File

@ -2078,7 +2078,18 @@ sanitize:
vecs += 2;
}
si->base = (Elf32_Addr) si->phdr - si->phdr->p_vaddr;
/* Compute the value of si->base. We can't rely on the fact that
* the first entry is the PHDR because this will not be true
* for certain executables (e.g. some in the NDK unit test suite)
*/
int nn;
si->base = 0;
for ( nn = 0; nn < si->phnum; nn++ ) {
if (si->phdr[nn].p_type == PT_PHDR) {
si->base = (Elf32_Addr) si->phdr - si->phdr[nn].p_vaddr;
break;
}
}
si->dynamic = (unsigned *)-1;
si->wrprotect_start = 0xffffffff;
si->wrprotect_end = 0;