From 3643b505a6f95e65037c5d906e7fb81ac16698cf Mon Sep 17 00:00:00 2001 From: Arseny Kapoulkine Date: Wed, 22 Apr 2015 08:38:52 -0700 Subject: Fix node_pi memory leak --- src/pugixml.cpp | 8 ++++++++ tests/test_dom_modify.cpp | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/src/pugixml.cpp b/src/pugixml.cpp index 80d9d9f..c5e77e8 100644 --- a/src/pugixml.cpp +++ b/src/pugixml.cpp @@ -1163,6 +1163,14 @@ PUGI__NS_BEGIN if (n->header & impl::xml_memory_page_contents_allocated_mask) alloc.deallocate_string(n->contents); + if (PUGI__NODETYPE(n) == node_pi) + { + xml_node_pi_struct* pn = static_cast(n); + + if (pn->pi_header & impl::xml_memory_page_contents_allocated_mask) + alloc.deallocate_string(pn->pi_value); + } + for (xml_attribute_struct* attr = n->first_attribute; attr; ) { xml_attribute_struct* next = attr->next_attribute; diff --git a/tests/test_dom_modify.cpp b/tests/test_dom_modify.cpp index 54bbee4..365561f 100644 --- a/tests/test_dom_modify.cpp +++ b/tests/test_dom_modify.cpp @@ -948,6 +948,25 @@ TEST(dom_node_memory_limit) } } +TEST(dom_node_memory_limit_pi) +{ + const unsigned int length = 65536; + static char_t string[length + 1]; + + for (unsigned int i = 0; i < length; ++i) string[i] = 'a'; + string[length] = 0; + + test_runner::_memory_fail_threshold = 32768 * 2 + sizeof(string); + + xml_document doc; + + for (int j = 0; j < 32; ++j) + { + CHECK(doc.append_child(node_pi).set_value(string)); + CHECK(doc.remove_child(doc.first_child())); + } +} + TEST(dom_node_doctype_top_level) { xml_document doc; -- cgit v1.2.3