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

Fix undefined behavior while calling memcpy

Browse Source 
Calling memcpy(x, 0, 0) is technically undefined (although it should usually
be a no-op).
This commit is contained in:
Arseny Kapoulkine 2014-11-02 09:30:56 +01:00
parent f68a320a02
commit e9948b4b05
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pugixml.cpp
View File

@ -1352,7 +1352,11 @@ PUGI__NS_BEGIN
char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t))); char_t* buffer = static_cast<char_t*>(xml_memory::allocate((length + 1) * sizeof(char_t)));
if (!buffer) return false; if (!buffer) return false;
memcpy(buffer, contents, length * sizeof(char_t)); if (contents)
memcpy(buffer, contents, length * sizeof(char_t));
else
assert(length == 0);
buffer[length] = 0; buffer[length] = 0;
out_buffer = buffer; out_buffer = buffer;

13
tests/test_dom_modify.cpp
View File

@ -1091,6 +1091,19 @@ TEST_XML(dom_node_append_buffer_fragment, "<node />")
CHECK_NODE(doc, STR("<node>1234</node>")); CHECK_NODE(doc, STR("<node>1234</node>"));
} }
TEST_XML(dom_node_append_buffer_empty, "<node />")
{
xml_node node = doc.child(STR("node"));
CHECK(node.append_buffer("", 0).status == status_no_document_element);
CHECK(node.append_buffer("", 0, parse_fragment).status == status_ok);
CHECK(node.append_buffer(0, 0).status == status_no_document_element);
CHECK(node.append_buffer(0, 0, parse_fragment).status == status_ok);
CHECK_NODE(doc, STR("<node />"));
}
TEST_XML(dom_node_prepend_move, "<node>foo<child/></node>") TEST_XML(dom_node_prepend_move, "<node>foo<child/></node>")
{ {
xml_node child = doc.child(STR("node")).child(STR("child")); xml_node child = doc.child(STR("node")).child(STR("child"));