3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-27 13:33:17 +08:00
Code Issues Projects Releases Wiki Activity

Fix xml_node::offset_debug for corner cases

Browse Source 
Computed offsets for documents with nodes that were added using append_buffer
or newly appended nodes without name/value information were invalid.
This commit is contained in:
Arseny Kapoulkine 2014-11-05 09:32:52 +01:00
parent ab12b30c83
commit aa1a61c59f
2 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/pugixml.cpp
View File

@ -5402,8 +5402,8 @@ namespace pugi
impl::xml_document_struct& doc = impl::get_document(_root);
const char_t* buffer = doc.buffer;
if (!buffer) return -1;
// we can determine the offset reliably only if there is exactly once parse buffer
if (!doc.buffer || doc.extra_buffers) return -1;
switch (type())
{
@ -5413,13 +5413,13 @@ namespace pugi
case node_element:
case node_declaration:
case node_pi:
return (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) ? -1 : _root->name - buffer;
return _root->name && (_root->header & impl::xml_memory_page_name_allocated_or_shared_mask) == 0 ? _root->name - doc.buffer : -1;
case node_pcdata:
case node_cdata:
case node_comment:
case node_doctype:
return (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) ? -1 : _root->value - buffer;
return _root->value && (_root->header & impl::xml_memory_page_value_allocated_or_shared_mask) == 0 ? _root->value - doc.buffer : -1;
default:
return -1;

37
tests/test_dom_traverse.cpp
View File

@ -924,6 +924,43 @@ TEST_XML_FLAGS(dom_offset_debug, "<?xml?><!DOCTYPE><?pi?><!--comment--><node>pcd
CHECK((cit++)->offset_debug() == 58);
}
TEST(dom_offset_debug_encoding)
{
char buf[] = { 0, '<', 0, 'n', 0, '/', 0, '>' };
xml_document doc;
CHECK(doc.load_buffer(buf, sizeof(buf)));
CHECK(doc.offset_debug() == 0);
CHECK(doc.first_child().offset_debug() == 1);
}
TEST_XML(dom_offset_debug_append, "<node/>")
{
xml_node c1 = doc.first_child();
xml_node c2 = doc.append_child(STR("node"));
xml_node c3 = doc.append_child(node_pcdata);
CHECK(doc.offset_debug() == 0);
CHECK(c1.offset_debug() == 1);
CHECK(c2.offset_debug() == -1);
CHECK(c3.offset_debug() == -1);
c1.set_name(STR("nodenode"));
CHECK(c1.offset_debug() == -1);
}
TEST_XML(dom_offset_debug_append_buffer, "<node/>")
{
CHECK(doc.offset_debug() == 0);
CHECK(doc.first_child().offset_debug() == 1);
CHECK(doc.append_buffer("<node/>", 7));
CHECK(doc.offset_debug() == -1);
CHECK(doc.first_child().offset_debug() == -1);
CHECK(doc.last_child().offset_debug() == -1);
}
TEST_XML(dom_internal_object, "<node attr='value'>value</node>")
{
xml_node node = doc.child(STR("node"));