From 812f7299b3555862d1daf9aeec5d8d3dac59835a Mon Sep 17 00:00:00 2001
From: Tim Strazzere <diff@sentinelone.com>
Date: Thu, 21 Apr 2016 13:22:40 -0700
Subject: [PATCH] Avoid SIGABRT due to over allocating during new instance of
objects.
---
elfio/elfio_section.hpp | 19 ++++++++++++++++---
elfio/elfio_segment.hpp | 6 +++++-
2 files changed, 21 insertions(+), 4 deletions(-)
diff --git a/elfio/elfio_section.hpp b/elfio/elfio_section.hpp
index 2bc9238..4b8819c 100644
--- a/elfio/elfio_section.hpp
+++ b/elfio/elfio_section.hpp
@@ -147,7 +147,11 @@ class section_impl : public section
{
if ( get_type() != SHT_NOBITS ) {
delete [] data;
- data = new char[size];
+ try {
+ data = new char[size];
+ } catch (const std::bad_alloc&) {
+ data_size = 0;
+ }
if ( 0 != data && 0 != raw_data ) {
data_size = size;
std::copy( raw_data, raw_data + size, data );
@@ -174,7 +178,12 @@ class section_impl : public section
}
else {
data_size = 2*( data_size + size);
- char* new_data = new char[data_size];
+ char* new_data;
+ try {
+ new_data = new char[data_size];
+ } catch (const std::bad_alloc&) {
+ new_data = 0;
+ }
if ( 0 != new_data ) {
std::copy( data, data + get_size(), new_data );
std::copy( raw_data, raw_data + size, new_data + get_size() );
@@ -216,7 +225,11 @@ class section_impl : public section
Elf_Xword size = get_size();
if ( 0 == data && SHT_NULL != get_type() && SHT_NOBITS != get_type() ) {
- data = new char[size];
+ try {
+ data = new char[size];
+ } catch (const std::bad_alloc&) {
+ data_size = 0;
+ }
if ( 0 != size ) {
stream.seekg( (*convertor)( header.sh_offset ) );
stream.read( data, size );
diff --git a/elfio/elfio_segment.hpp b/elfio/elfio_segment.hpp
index 4d35a74..428e65b 100644
--- a/elfio/elfio_segment.hpp
+++ b/elfio/elfio_segment.hpp
@@ -183,7 +183,11 @@ class segment_impl : public segment
if ( PT_NULL != get_type() && 0 != get_file_size() ) {
stream.seekg( (*convertor)( ph.p_offset ) );
Elf_Xword size = get_file_size();
- data = new char[size];
+ try {
+ data = new char[size];
+ } catch (const std::bad_alloc&) {
+ data = 0;
+ }
if ( 0 != data ) {
stream.read( data, size );
}
--
GitLab