i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't read() the individual program and section headers, but rather read()

Browse Source 
the respective tables at once.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@34405 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2009-12-01 09:55:33 +00:00
parent 5b576468d3
commit 81eee41edf
1 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/storage/ResourceFile.cpp
+26 -8
View File
@@ -538,12 +538,21 @@ ResourceFile::_InitELFXFile(BFile& file, uint64 fileSize)
resourceOffset = std::max(resourceOffset, resourceOffset = std::max(resourceOffset,
programHeaderTableOffset + programHeaderTableSize); programHeaderTableOffset + programHeaderTableSize);
// load the program headers into memory
uint8* programHeaders = (uint8*)malloc(
programHeaderCount * programHeaderSize);
if (programHeaders == NULL)
throw Exception(B_NO_MEMORY);
MemoryDeleter programHeadersDeleter(programHeaders);
read_exactly(file, programHeaderTableOffset, programHeaders,
programHeaderCount * programHeaderSize,
"Failed to read ELF program headers.");
// iterate through the program headers // iterate through the program headers
for (uint32 i = 0; i < programHeaderCount; i++) { for (uint32 i = 0; i < programHeaderCount; i++) {
uint64 shOffset = programHeaderTableOffset + i * programHeaderSize; ElfProgramHeader& programHeader
ElfProgramHeader programHeader; = *(ElfProgramHeader*)(programHeaders + i * programHeaderSize);
read_exactly(file, shOffset, &programHeader,
sizeof(ElfProgramHeader), "Failed to read ELF program header.");
// get the header values // get the header values
uint32 type = _GetInt(programHeader.p_type); uint32 type = _GetInt(programHeader.p_type);
@@ -587,12 +596,21 @@ ResourceFile::_InitELFXFile(BFile& file, uint64 fileSize)
resourceOffset = std::max(resourceOffset, resourceOffset = std::max(resourceOffset,
sectionHeaderTableOffset + sectionHeaderTableSize); sectionHeaderTableOffset + sectionHeaderTableSize);
// load the section headers into memory
uint8* sectionHeaders = (uint8*)malloc(
sectionHeaderCount * sectionHeaderSize);
if (sectionHeaders == NULL)
throw Exception(B_NO_MEMORY);
MemoryDeleter sectionHeadersDeleter(sectionHeaders);
read_exactly(file, sectionHeaderTableOffset, sectionHeaders,
sectionHeaderCount * sectionHeaderSize,
"Failed to read ELF section headers.");
// iterate through the section headers // iterate through the section headers
for (uint32 i = 0; i < sectionHeaderCount; i++) { for (uint32 i = 0; i < sectionHeaderCount; i++) {
uint32 shOffset = sectionHeaderTableOffset + i * sectionHeaderSize; ElfSectionHeader& sectionHeader
ElfSectionHeader sectionHeader; = *(ElfSectionHeader*)(sectionHeaders + i * sectionHeaderSize);
read_exactly(file, shOffset, &sectionHeader,
sizeof(ElfSectionHeader), "Failed to read ELF section header.");
// get the header values // get the header values
uint32 type = _GetInt(sectionHeader.sh_type); uint32 type = _GetInt(sectionHeader.sh_type);