wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 783331 - Add Phdr pointer and count to dl_iterate_phdr implementation. r=nfroyd

Browse Source
This commit is contained in:
Mike Hommey 2012-08-29 08:55:57 +02:00
parent a015edd41e
commit 47d4a8624f
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mozglue/linker/ElfLoader.cpp
View File

@ -105,6 +105,20 @@ __wrap_dl_iterate_phdr(dl_phdr_cb callback, void *data)
info.dlpi_name = it->l_name;
info.dlpi_phdr = NULL;
info.dlpi_phnum = 0;
// Assuming l_addr points to Elf headers (in most cases, this is true),
// get the Phdr location from there.
uint8_t mapped;
// If the page is not mapped, mincore returns an error.
if (!mincore(const_cast<void*>(it->l_addr), PAGE_SIZE, &mapped)) {
const Elf::Ehdr *ehdr = Elf::Ehdr::validate(it->l_addr);
if (ehdr) {
info.dlpi_phdr = reinterpret_cast<const Elf::Phdr *>(
reinterpret_cast<const char *>(ehdr) + ehdr->e_phoff);
info.dlpi_phnum = ehdr->e_phnum;
}
}
int ret = callback(&info, sizeof(dl_phdr_info), data);
if (ret)
return ret;