mirror/ELFIO
1
0
Fork 0
mirror of https://github.com/serge1/ELFIO.git synced 2025-02-06 21:39:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: make segment loading similar to readelf's algorithm

Browse Source 
ALLOC sections are now matched against the virtual address space of
the segment. Non ALLOC sections still use the offset approach.
This commit is contained in:
Mario Werner 2014-11-14 08:04:55 +01:00
parent 8dda93f2bb
commit e5592ddfdd
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
elfio/elfio.hpp
View File

@ -387,14 +387,23 @@ class elfio
seg->load( stream, (std::streamoff)offset + i * entry_size );
seg->set_index( i );
// add sections to the segments based on the load address
// add sections to the segments (similar to readelfs algorithm)
Elf64_Off segBaseOffset = seg->get_offset();
Elf64_Off segEndOffset = segBaseOffset + seg->get_memory_size();
Elf_Half sec_num = sections.size();
for( Elf_Half j = 0; j < sec_num; ++j ) {
Elf64_Off segEndOffset = segBaseOffset + seg->get_file_size();
Elf64_Off segVBaseAddr = seg->get_virtual_address();
Elf64_Off segVEndAddr = segVBaseAddr + seg->get_memory_size();
for( Elf_Half j = 0; j < sections.size(); ++j ) {
const section* psec = sections[j];
Elf64_Off secOffset = psec->get_offset();
if( segBaseOffset <= secOffset && secOffset < segEndOffset ) {
// SHF_ALLOC sections are matched based on the virtual address
// otherwise the file offset is matched
if(psec->get_flags() & SHF_ALLOC
? (segVBaseAddr <= psec->get_address()
&& psec->get_address() + psec->get_size()
<= segVEndAddr)
: (segBaseOffset <= psec->get_offset()
&& psec->get_offset() + psec->get_size()
<= segEndOffset)) {
seg->add_section_index( psec->get_index(),
psec->get_addr_align() );
}