mirror/ELFIO
1
0
Fork 0
mirror of https://github.com/serge1/ELFIO.git synced 2025-01-30 15:32:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

use the NULL section instead of offset == 0

Browse Source 
This change makes it possible to use the regular API to build up
elf files which include the file header.
This commit is contained in:
Mario Werner 2014-12-03 10:38:44 +01:00
parent d2a27c7d96
commit 91e61ec4b2
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
elfio/elfio.hpp
View File

@ -412,14 +412,13 @@ class elfio
// SHF_ALLOC sections are matched based on the virtual address // SHF_ALLOC sections are matched based on the virtual address
// otherwise the file offset is matched // otherwise the file offset is matched
if( psec->get_type() != SHT_NULL if( psec->get_flags() & SHF_ALLOC
&& (psec->get_flags() & SHF_ALLOC
? (segVBaseAddr <= psec->get_address() ? (segVBaseAddr <= psec->get_address()
&& psec->get_address() + psec->get_size() && psec->get_address() + psec->get_size()
<= segVEndAddr) <= segVEndAddr)
: (segBaseOffset <= psec->get_offset() : (segBaseOffset <= psec->get_offset()
&& psec->get_offset() + psec->get_size() && psec->get_offset() + psec->get_size()
<= segEndOffset))) { <= segEndOffset)) {
seg->add_section_index( psec->get_index(), seg->add_section_index( psec->get_index(),
psec->get_addr_align() ); psec->get_addr_align() );
} }
@ -583,15 +582,17 @@ class elfio
Elf_Xword segment_filesize = 0; Elf_Xword segment_filesize = 0;
Elf_Xword seg_start_pos = current_file_pos; Elf_Xword seg_start_pos = current_file_pos;
segment* seg = worklist[i]; segment* seg = worklist[i];
// special case: PHDR segments // special case: PHDR segments
// this segment contains the program headers but no sections // this segment contains the program headers but no sections
if( seg->get_type() == PT_PHDR && seg->get_sections_num() == 0 ) { if( seg->get_type() == PT_PHDR && seg->get_sections_num() == 0 ) {
seg_start_pos = header->get_segments_offset(); seg_start_pos = header->get_segments_offset();
segment_memory = segment_filesize = segment_memory = segment_filesize =
header->get_segment_entry_size() * header->get_segments_num(); header->get_segment_entry_size() * header->get_segments_num();
// special case: segments with offset 0 // special case:
} else if ( seg->is_offset_initialized() && seg->get_offset() == 0 ) { // segments which start with the NULL section and have further sections
} else if ( seg->get_sections_num() > 1
&& sections[seg->get_section_index_at( 0 )]->get_type() == SHT_NULL ) {
seg_start_pos = 0; seg_start_pos = 0;
if( seg->get_sections_num() ) if( seg->get_sections_num() )
segment_memory = segment_filesize = current_file_pos; segment_memory = segment_filesize = current_file_pos;
@ -615,6 +616,12 @@ class elfio
section* sec = sections[ index ]; section* sec = sections[ index ];
// the NULL section is always generated
if( SHT_NULL == sec->get_type()) {
section_generated[index] = true;
continue;
}
Elf_Xword secAlign = 0; Elf_Xword secAlign = 0;
// fix up the alignment // fix up the alignment
if ( !section_generated[index] && sec->is_address_initialized() if ( !section_generated[index] && sec->is_address_initialized()