mirror/ELFIO
1
0
Fork 0
mirror of https://github.com/serge1/ELFIO.git synced 2024-09-15 15:13:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Modernize 'segment' implementation

Browse Source
This commit is contained in:
Serge Lamikhov-Center 2022-08-31 22:13:18 +03:00
parent 847249dd27
commit c22276ec1a
2 changed files with 29 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
elfio/elfio_section.hpp
View File

@ -272,8 +272,8 @@ template <class T> class section_impl : public section
std::string name;
std::unique_ptr<char> data;
Elf_Word data_size = 0;
const endianess_convertor* convertor = 0;
const address_translator* translator = 0;
const endianess_convertor* convertor = nullptr;
const address_translator* translator = nullptr;
bool is_address_set = false;
size_t stream_size = 0;
};

58
elfio/elfio_segment.hpp
View File

@ -74,15 +74,10 @@ template <class T> class segment_impl : public segment
//------------------------------------------------------------------------------
segment_impl( const endianess_convertor* convertor,
const address_translator* translator )
: index( 0 ), data( nullptr ), convertor( convertor ),
translator( translator ), stream_size( 0 ), is_offset_set( false )
: convertor( convertor ), translator( translator )
{
std::fill_n( reinterpret_cast<char*>( &ph ), sizeof( ph ), '\0' );
}
//------------------------------------------------------------------------------
~segment_impl() override { delete[] data; }
//------------------------------------------------------------------------------
// Section info functions
ELFIO_GET_SET_ACCESS( Elf_Word, type, ph.p_type );
@ -98,7 +93,7 @@ template <class T> class segment_impl : public segment
Elf_Half get_index() const override { return index; }
//------------------------------------------------------------------------------
const char* get_data() const override { return data; }
const char* get_data() const override { return data.get(); }
//------------------------------------------------------------------------------
Elf_Half add_section_index( Elf_Half sec_index,
@ -162,7 +157,7 @@ template <class T> class segment_impl : public segment
bool load( std::istream& stream, std::streampos header_offset ) override
{
if ( translator->empty() ) {
stream.seekg( 0, stream.end );
stream.seekg( 0, std::istream::end );
set_stream_size( size_t( stream.tellg() ) );
}
else {
@ -173,25 +168,26 @@ template <class T> class segment_impl : public segment
stream.read( reinterpret_cast<char*>( &ph ), sizeof( ph ) );
is_offset_set = true;
if ( PT_NULL != get_type() && 0 != get_file_size() ) {
stream.seekg( ( *translator )[( *convertor )( ph.p_offset )] );
Elf_Xword size = get_file_size();
if ( PT_NULL == get_type() || 0 == get_file_size() ) {
return true;
}
if ( size > get_stream_size() ) {
data = nullptr;
}
else {
data = new ( std::nothrow ) char[(size_t)size + 1];
stream.seekg( ( *translator )[( *convertor )( ph.p_offset )] );
Elf_Xword size = get_file_size();
if ( nullptr != data ) {
stream.read( data, size );
if (static_cast<Elf_Xword>(stream.gcount()) != size) {
delete[] data;
data = nullptr;
return false;
}
data[size] = 0;
if ( size > get_stream_size() ) {
data = nullptr;
}
else {
data.reset( new ( std::nothrow ) char[(size_t)size + 1] );
if ( nullptr != data.get() ) {
stream.read( data.get(), size );
if ( static_cast<Elf_Xword>( stream.gcount() ) != size ) {
data = nullptr;
return false;
}
data.get()[size] = 0;
}
}
@ -217,14 +213,14 @@ template <class T> class segment_impl : public segment
//------------------------------------------------------------------------------
private:
T ph;
Elf_Half index;
char* data;
T ph = { 0 };
Elf_Half index = 0;
std::unique_ptr<char> data;
std::vector<Elf_Half> sections;
const endianess_convertor* convertor;
const address_translator* translator;
size_t stream_size;
bool is_offset_set;
const endianess_convertor* convertor = nullptr;
const address_translator* translator = nullptr;
size_t stream_size = 0;
bool is_offset_set = false;
};
} // namespace ELFIO