External/pugixml
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

XPath: Replace all (re)allocate_throw with (re)allocate_nothrow

Browse Source 
This generates some out-of-memory code paths that are not covered by
existing tests, which will need to be resolved later.
This commit is contained in:
Arseny Kapoulkine 2017-01-30 22:28:57 -08:00
parent 60d5688a87
commit 9e40c58532
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/pugixml.cpp
View File

@ -7688,8 +7688,8 @@ PUGI__NS_BEGIN
size_t result_length = target_length + source_length; size_t result_length = target_length + source_length;
// allocate new buffer // allocate new buffer
char_t* result = static_cast<char_t*>(alloc->reallocate_throw(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t))); char_t* result = static_cast<char_t*>(alloc->reallocate_nothrow(_uses_heap ? const_cast<char_t*>(_buffer) : 0, (target_length + 1) * sizeof(char_t), (result_length + 1) * sizeof(char_t)));
assert(result); if (!result) return;
// append first string to the new buffer in case there was no reallocation // append first string to the new buffer in case there was no reallocation
if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t)); if (!_uses_heap) memcpy(result, _buffer, target_length * sizeof(char_t));
@ -8148,8 +8148,8 @@ PUGI__NS_BEGIN
// allocate a buffer of suitable length for the number // allocate a buffer of suitable length for the number
size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4; size_t result_size = strlen(mantissa_buffer) + (exponent > 0 ? exponent : -exponent) + 4;
char_t* result = static_cast<char_t*>(alloc->allocate_throw(sizeof(char_t) * result_size)); char_t* result = static_cast<char_t*>(alloc->allocate_nothrow(sizeof(char_t) * result_size));
assert(result); if (!result) return xpath_string();
// make the number! // make the number!
char_t* s = result; char_t* s = result;
@ -8780,8 +8780,8 @@ PUGI__NS_BEGIN
if (size_ + count > capacity) if (size_ + count > capacity)
{ {
// reallocate the old array or allocate a new one // reallocate the old array or allocate a new one
xpath_node* data = static_cast<xpath_node*>(alloc->reallocate_throw(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node))); xpath_node* data = static_cast<xpath_node*>(alloc->reallocate_nothrow(_begin, capacity * sizeof(xpath_node), (size_ + count) * sizeof(xpath_node)));
assert(data); if (!data) return;
// finalize // finalize
_begin = data; _begin = data;
@ -8832,8 +8832,8 @@ PUGI__NS_BEGIN
size_t new_capacity = capacity + capacity / 2 + 1; size_t new_capacity = capacity + capacity / 2 + 1;
// reallocate the old array or allocate a new one // reallocate the old array or allocate a new one
xpath_node* data = static_cast<xpath_node*>(alloc->reallocate_throw(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node))); xpath_node* data = static_cast<xpath_node*>(alloc->reallocate_nothrow(_begin, capacity * sizeof(xpath_node), new_capacity * sizeof(xpath_node)));
assert(data); if (!data) return;
// finalize // finalize
_begin = data; _begin = data;
@ -10418,8 +10418,8 @@ PUGI__NS_BEGIN
// allocate on-heap for large concats // allocate on-heap for large concats
if (count > sizeof(static_buffer) / sizeof(static_buffer[0])) if (count > sizeof(static_buffer) / sizeof(static_buffer[0]))
{ {
buffer = static_cast<xpath_string*>(stack.temp->allocate_throw(count * sizeof(xpath_string))); buffer = static_cast<xpath_string*>(stack.temp->allocate_nothrow(count * sizeof(xpath_string)));
assert(buffer); if (!buffer) return xpath_string();
} }
// evaluate all strings to temporary stack // evaluate all strings to temporary stack
@ -10436,8 +10436,8 @@ PUGI__NS_BEGIN
for (size_t i = 0; i < count; ++i) length += buffer[i].length(); for (size_t i = 0; i < count; ++i) length += buffer[i].length();
// create final string // create final string
char_t* result = static_cast<char_t*>(stack.result->allocate_throw((length + 1) * sizeof(char_t))); char_t* result = static_cast<char_t*>(stack.result->allocate_nothrow((length + 1) * sizeof(char_t)));
assert(result); if (!result) return xpath_string();
char_t* ri = result; char_t* ri = result;