diff --git a/src/stub/l_lx_elf.c b/src/stub/l_lx_elf.c index 1f6d9b71..8d096ee5 100644 --- a/src/stub/l_lx_elf.c +++ b/src/stub/l_lx_elf.c @@ -258,18 +258,18 @@ xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum, char **const p_brk ) { - size_t lo= ~0, hi= 0, szlo= 0; + size_t lo= ~0, hi= 0, szlo= 0; char *addr; mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|' - for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { - if (phdr->p_vaddr < lo) { - lo = phdr->p_vaddr; + for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { + if (phdr->p_vaddr < lo) { + lo = phdr->p_vaddr; szlo = phdr->p_filesz; - } - if (hi < (phdr->p_memsz + phdr->p_vaddr)) { - hi = phdr->p_memsz + phdr->p_vaddr; - } - } + } + if (hi < (phdr->p_memsz + phdr->p_vaddr)) { + hi = phdr->p_memsz + phdr->p_vaddr; + } + } szlo += ~PAGE_MASK & lo; // page fragment on lo edge lo -= ~PAGE_MASK & lo; // round down to page boundary hi = PAGE_MASK & (hi - lo - PAGE_MASK -1); // page length diff --git a/src/stub/l_lx_sh.c b/src/stub/l_lx_sh.c index 2f6e8b54..4978db31 100644 --- a/src/stub/l_lx_sh.c +++ b/src/stub/l_lx_sh.c @@ -186,18 +186,18 @@ static unsigned long // returns relocation constant __attribute__((regparm(3), stdcall)) xfind_pages(unsigned mflags, Elf32_Phdr const *phdr, int phnum) { - size_t lo= ~0, hi= 0, szlo= 0; + size_t lo= ~0, hi= 0, szlo= 0; char *addr; mflags += MAP_PRIVATE | MAP_ANONYMOUS; // '+' can optimize better than '|' - for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { - if (phdr->p_vaddr < lo) { - lo = phdr->p_vaddr; + for (; --phnum>=0; ++phdr) if (PT_LOAD==phdr->p_type) { + if (phdr->p_vaddr < lo) { + lo = phdr->p_vaddr; szlo = phdr->p_filesz; - } - if (hi < (phdr->p_memsz + phdr->p_vaddr)) { - hi = phdr->p_memsz + phdr->p_vaddr; - } - } + } + if (hi < (phdr->p_memsz + phdr->p_vaddr)) { + hi = phdr->p_memsz + phdr->p_vaddr; + } + } if (MAP_FIXED & mflags) { // the "shell", and not the PT_INTERP // This is a dirty hack to set the proper value for brk(0) as seen by // the "shell" which we will mmap() soon, upon return to do_xmap().