diff options
Diffstat (limited to 'libs/elfio/elfio/elfio_section.hpp')
-rw-r--r-- | libs/elfio/elfio/elfio_section.hpp | 41 |
1 files changed, 21 insertions, 20 deletions
diff --git a/libs/elfio/elfio/elfio_section.hpp b/libs/elfio/elfio/elfio_section.hpp index 43c41f4..e02b06b 100644 --- a/libs/elfio/elfio/elfio_section.hpp +++ b/libs/elfio/elfio/elfio_section.hpp @@ -66,7 +66,7 @@ class section protected: ELFIO_SET_ACCESS_DECL( Elf64_Off, offset ); ELFIO_SET_ACCESS_DECL( Elf_Half, index ); - + virtual void load( std::istream& stream, std::streampos header_offset ) = 0; virtual void save( std::ostream& stream, @@ -158,17 +158,18 @@ class section_impl : public section { if ( get_type() != SHT_NOBITS ) { delete [] data; - try { - data = new char[size]; - } catch (const std::bad_alloc&) { - data = 0; - data_size = 0; - size = 0; - } + data = new char[size]; + if ( 0 != data && 0 != raw_data ) { data_size = size; std::copy( raw_data, raw_data + size, data ); } + else + { + data_size = 0; + size = 0; + } + } set_size( size ); @@ -192,18 +193,18 @@ class section_impl : public section else { data_size = 2*( data_size + size); char* new_data; - try { - new_data = new char[data_size]; - } catch (const std::bad_alloc&) { - new_data = 0; - size = 0; - } + new_data = new char[data_size]; if ( 0 != new_data ) { std::copy( data, data + get_size(), new_data ); std::copy( raw_data, raw_data + size, new_data + get_size() ); delete [] data; data = new_data; } + else + { + size = 0; + } + } set_size( get_size() + size ); } @@ -244,12 +245,7 @@ class section_impl : public section Elf_Xword size = get_size(); if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() && size < get_stream_size()) { - try { - data = new char[size + 1]; - } catch (const std::bad_alloc&) { - data = 0; - data_size = 0; - } + data = new char[size + 1]; if ( ( 0 != size ) && ( 0 != data ) ) { stream.seekg( (*convertor)( header.sh_offset ) ); @@ -257,6 +253,11 @@ class section_impl : public section data[size] = 0; // Ensure data is ended with 0 to avoid oob read data_size = size; } + else + { + data_size = 0; + } + } } |