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

Add allocator reserve for copying

Browse Source 
Since copying no longer relies on child insertion we have to also reserve
space in the hash table for the allocator so that pointer manipulations are
guaranteed to succeed.
This commit is contained in:
Arseny Kapoulkine 2014-11-20 23:49:59 -08:00
parent db8df4a566
commit 4b8da65be9
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/pugixml.cpp
View File

@ -5680,7 +5680,10 @@ namespace pugi
xml_node_type type_ = proto.type(); xml_node_type type_ = proto.type();
if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!impl::allow_insert_child(type(), type_)) return xml_node();
xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return xml_node();
xml_node n(impl::allocate_node(alloc, type_));
if (!n) return xml_node(); if (!n) return xml_node();
impl::append_node(n._root, _root); impl::append_node(n._root, _root);
@ -5694,7 +5697,10 @@ namespace pugi
xml_node_type type_ = proto.type(); xml_node_type type_ = proto.type();
if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!impl::allow_insert_child(type(), type_)) return xml_node();
xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return xml_node();
xml_node n(impl::allocate_node(alloc, type_));
if (!n) return xml_node(); if (!n) return xml_node();
impl::prepend_node(n._root, _root); impl::prepend_node(n._root, _root);
@ -5709,7 +5715,10 @@ namespace pugi
if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!impl::allow_insert_child(type(), type_)) return xml_node();
if (!node._root || node._root->parent != _root) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node();
xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return xml_node();
xml_node n(impl::allocate_node(alloc, type_));
if (!n) return xml_node(); if (!n) return xml_node();
impl::insert_node_after(n._root, node._root); impl::insert_node_after(n._root, node._root);
@ -5724,7 +5733,10 @@ namespace pugi
if (!impl::allow_insert_child(type(), type_)) return xml_node(); if (!impl::allow_insert_child(type(), type_)) return xml_node();
if (!node._root || node._root->parent != _root) return xml_node(); if (!node._root || node._root->parent != _root) return xml_node();
xml_node n(impl::allocate_node(impl::get_allocator(_root), type_)); impl::xml_allocator& alloc = impl::get_allocator(_root);
if (!alloc.reserve()) return xml_node();
xml_node n(impl::allocate_node(alloc, type_));
if (!n) return xml_node(); if (!n) return xml_node();
impl::insert_node_before(n._root, node._root); impl::insert_node_before(n._root, node._root);