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

Fix node copying for some out of memory cases

Browse Source 
A page can fail to allocate during attribute creation; this case was not
previously handled.

git-svn-id: https://pugixml.googlecode.com/svn/trunk@1080 99668b35-9821-0410-8761-19e4c4f06640
This commit is contained in:
Arseny Kapoulkine 2014-10-25 16:37:16 +00:00
parent 503abf607a
commit 0b7964917c
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pugixml.cpp
View File

@ -164,6 +164,8 @@ PUGI__NS_BEGIN
static deallocation_function deallocate; static deallocation_function deallocate;
}; };
// Global allocation functions are stored in class statics so that in header mode linker deduplicates them
// Without a template<> we'll get multiple definitions of the same static
template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate; template <typename T> allocation_function xml_memory_management_function_storage<T>::allocate = default_allocate;
template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate; template <typename T> deallocation_function xml_memory_management_function_storage<T>::deallocate = default_deallocate;
@ -3735,8 +3737,11 @@ PUGI__NS_BEGIN
{ {
xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn)); xml_attribute_struct* da = append_new_attribute(dn, get_allocator(dn));
node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc); if (da)
node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc); {
node_copy_string(da->name, da->header, xml_memory_page_name_allocated_mask, sa->name, sa->header, shared_alloc);
node_copy_string(da->value, da->header, xml_memory_page_value_allocated_mask, sa->value, sa->header, shared_alloc);
}
} }
} }

17
tests/test_dom_modify.cpp
View File

@ -1361,13 +1361,22 @@ TEST_XML(dom_node_copyless_taint, "<node attr=\"value\" />")
CHECK_NODE(doc, STR("<nod1 attr=\"value\" /><node attr=\"valu2\" /><node att3=\"value\" />")); CHECK_NODE(doc, STR("<nod1 attr=\"value\" /><node attr=\"valu2\" /><node att3=\"value\" />"));
} }
TEST_XML(dom_node_copy_out_of_memory, "<node><child1 attr1='value1' attr2='value2' /><child2 /><child3>text1<child4 />text2</child3></node>") TEST_XML(dom_node_copy_out_of_memory_node, "<node><child1 /><child2 /><child3>text1<child4 />text2</child3></node>")
{ {
test_runner::_memory_fail_threshold = 32768 * 2 + 4096; test_runner::_memory_fail_threshold = 32768 * 2 + 4096;
xml_document copy; xml_document copy;
for (int i = 0; i < 100; ++i) for (int i = 0; i < 1000; ++i)
copy.append_copy(doc.first_child()); copy.append_copy(doc.first_child());
}
TEST_XML(dom_node_copy_out_of_memory_attr, "<node attr1='' attr2='' attr3='' attr4='' attr5='' attr6='' attr7='' attr8='' attr9='' attr10='' attr11='' attr12='' attr13='' attr14='' attr15='' />")
{
test_runner::_memory_fail_threshold = 32768 * 2 + 4096;
xml_document copy;
for (int i = 0; i < 1000; ++i)
copy.append_copy(doc.first_child());
} }
TEST_XML(dom_node_remove_deallocate, "<node attr='value'>text</node>") TEST_XML(dom_node_remove_deallocate, "<node attr='value'>text</node>")