Emulator-Archive/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-02-23 15:41:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix bogus size calculation in elf loader

Browse Source
This commit is contained in:
Henrik Rydgard 2012-11-05 13:30:46 +01:00
parent 6f85f02e25
commit 57026bee37
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Core/ELF/ElfReader.cpp
View File

@ -77,27 +77,27 @@ bool ElfReader::LoadInto(u32 vaddr)
bRelocate = (header->e_type != ET_EXEC);
entryPoint = header->e_entry;
u32 totalSize = 0;
for (int i=0; i<header->e_phnum; i++)
{
Elf32_Phdr *p = segments + i;
if (p->p_type == PT_LOAD && p->p_vaddr + p->p_memsz > totalSize)
{
totalSize = p->p_vaddr + p->p_memsz;
u32 totalStart = 0xFFFFFFFF;
u32 totalEnd = 0;
for (int i=0; i<header->e_phnum; i++) {
Elf32_Phdr *p = &segments[i];
if (p->p_type == PT_LOAD) {
if (p->p_vaddr < totalStart)
totalStart = p->p_vaddr;
if (p->p_vaddr + p->p_memsz > totalEnd)
totalEnd = p->p_vaddr + p->p_memsz;
}
}
u32 totalSize = totalEnd - totalStart;
if (vaddr)
vaddr = userMemory.AllocAt(vaddr, totalSize, "ELF");
else
vaddr = userMemory.Alloc(totalSize, false, "ELF");
if (bRelocate)
{
if (bRelocate) {
DEBUG_LOG(LOADER,"Relocatable module");
entryPoint += vaddr;
}
else
{
} else {
DEBUG_LOG(LOADER,"Prerelocated executable");
}