ReceiveTempSMS/Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dbghelp: Corrected the map/unmap operations for ELF sections.

Browse Source 
Now correctly free the mapped areas when no longer used.
This commit is contained in:
Eric Pouech 2007-01-06 09:07:45 +01:00 committed by Alexandre Julliard
parent c3bf8b88ad
commit 1b158dd38d
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/dbghelp/elf_module.c
View File

@ -147,8 +147,8 @@ static const char* elf_map_section(struct elf_file_map* fmap, int sidx)
return ELF_NO_MAP; return ELF_NO_MAP;
/* align required information on page size (we assume pagesize is a power of 2) */ /* align required information on page size (we assume pagesize is a power of 2) */
ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1); ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1);
size = (fmap->sect[sidx].shdr.sh_offset + size = ((fmap->sect[sidx].shdr.sh_offset +
fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1); fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst;
fmap->sect[sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fmap->fd, ofst); fmap->sect[sidx].mapped = mmap(NULL, size, PROT_READ, MAP_PRIVATE, fmap->fd, ofst);
if (fmap->sect[sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP; if (fmap->sect[sidx].mapped == ELF_NO_MAP) return ELF_NO_MAP;
return fmap->sect[sidx].mapped + (fmap->sect[sidx].shdr.sh_offset & (pgsz - 1)); return fmap->sect[sidx].mapped + (fmap->sect[sidx].shdr.sh_offset & (pgsz - 1));
@ -163,7 +163,14 @@ static void elf_unmap_section(struct elf_file_map* fmap, int sidx)
{ {
if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != ELF_NO_MAP) if (sidx >= 0 && sidx < fmap->elfhdr.e_shnum && fmap->sect[sidx].mapped != ELF_NO_MAP)
{ {
munmap((char*)fmap->sect[sidx].mapped, fmap->sect[sidx].shdr.sh_size); unsigned pgsz = getpagesize();
unsigned ofst, size;
ofst = fmap->sect[sidx].shdr.sh_offset & ~(pgsz - 1);
size = ((fmap->sect[sidx].shdr.sh_offset +
fmap->sect[sidx].shdr.sh_size + pgsz - 1) & ~(pgsz - 1)) - ofst;
if (munmap((char*)fmap->sect[sidx].mapped, size) < 0)
WARN("Couldn't unmap the section\n");
fmap->sect[sidx].mapped = ELF_NO_MAP; fmap->sect[sidx].mapped = ELF_NO_MAP;
} }
} }
@ -957,11 +964,11 @@ static BOOL elf_load_debug_info_from_map(struct module* module,
else else
WARN("Couldn't load debug information from %s\n", dbg_link); WARN("Couldn't load debug information from %s\n", dbg_link);
ret = ret || lret; ret = ret || lret;
elf_unmap_file(&fmap_link);
} }
else else
WARN("Couldn't load linked debug file for %s\n", WARN("Couldn't load linked debug file for %s\n",
module->module.ModuleName); module->module.ModuleName);
elf_unmap_file(&fmap_link);
} }
} }
if (strstr(module->module.ModuleName, "<elf>") || if (strstr(module->module.ModuleName, "<elf>") ||