The-Homebrew-Cloud/CustomRPXLoader
2
0
Fork 0
mirror of https://github.com/wiiu-env/CustomRPXLoader.git synced 2024-11-22 01:49:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

Avoid try catch

Browse Source
This commit is contained in:
Maschell 2022-01-21 18:53:06 +01:00
parent 124b73a5fe
commit 0847b2e901
2 changed files with 8 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/elfio/elfio_section.hpp
View File

@ -161,13 +161,7 @@ class section_impl : public section
{ {
if ( get_type() != SHT_NOBITS ) { if ( get_type() != SHT_NOBITS ) {
delete [] data; delete [] data;
try { data = new char[size];
data = new char[size];
} catch (const std::bad_alloc&) {
data = 0;
data_size = 0;
size = 0;
}
if ( 0 != data && 0 != raw_data ) { if ( 0 != data && 0 != raw_data ) {
data_size = size; data_size = size;
std::copy( raw_data, raw_data + size, data ); std::copy( raw_data, raw_data + size, data );
@ -195,12 +189,8 @@ class section_impl : public section
else { else {
data_size = 2*( data_size + size); data_size = 2*( data_size + size);
char* new_data; char* new_data;
try { new_data = new char[data_size];
new_data = new char[data_size];
} catch (const std::bad_alloc&) {
new_data = 0;
size = 0;
}
if ( 0 != new_data ) { if ( 0 != new_data ) {
std::copy( data, data + get_size(), new_data ); std::copy( data, data + get_size(), new_data );
std::copy( raw_data, raw_data + size, new_data + get_size() ); std::copy( raw_data, raw_data + size, new_data + get_size() );
@ -247,12 +237,8 @@ class section_impl : public section
Elf_Xword size = get_size(); Elf_Xword size = get_size();
if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() && size < get_stream_size()) { if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() && size < get_stream_size()) {
try {
data = new char[size + 1]; data = new char[size + 1];
} catch (const std::bad_alloc&) {
data = 0;
data_size = 0;
}
if ( ( 0 != size ) && ( 0 != data ) ) { if ( ( 0 != size ) && ( 0 != data ) ) {
stream.seekg( (*convertor)( header.sh_offset ) ); stream.seekg( (*convertor)( header.sh_offset ) );
@ -288,7 +274,7 @@ class section_impl : public section
inflateEnd(&s); inflateEnd(&s);
free(data); delete [] data;
data = uncompressedData; data = uncompressedData;
data_size = uncompressed_size; data_size = uncompressed_size;
set_size(uncompressed_size); set_size(uncompressed_size);

8
src/elfio/elfio_segment.hpp
View File

@ -206,12 +206,8 @@ class segment_impl : public segment
data = 0; data = 0;
} }
else { else {
try { data = new char[size + 1];
data = new char[size + 1];
} catch (const std::bad_alloc&) {
data = 0;
}
if ( 0 != data ) { if ( 0 != data ) {
stream.read( data, size ); stream.read( data, size );
data[size] = 0; data[size] = 0;