AxioDL
/
tinyxml2
mirror of https://github.com/AxioDL/tinyxml2.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'SirR4T-assert-fires-when-calling-XMLDocument--Value'

This commit is contained in:
Lee Thomason 2015-05-22 11:07:58 -07:00
parent c52aa55a86 8549202800
commit 03d0f4ea25
3 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tinyxml2.cpp
View File

@ -645,6 +645,9 @@ XMLNode::~XMLNode()
const char* XMLNode::Value() const const char* XMLNode::Value() const
{ {
// Catch an edge case: XMLDocuments don't have a a Value. Carefully return nullptr.
if ( this->ToDocument() )
return 0;
return _value.GetStr(); return _value.GetStr();
} }

8
tinyxml2.h
View File

@ -122,9 +122,9 @@ inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... )
/* Versioning, past 1.0.14: /* Versioning, past 1.0.14:
http://semver.org/ http://semver.org/
*/ */
static const int TIXML2_MAJOR_VERSION = 3; static const int TIXML2_MAJOR_VERSION = 3;
static const int TIXML2_MINOR_VERSION = 0; static const int TIXML2_MINOR_VERSION = 0;
static const int TIXML2_PATCH_VERSION = 0; static const int TIXML2_PATCH_VERSION = 0;
namespace tinyxml2 namespace tinyxml2
{ {
@ -708,7 +708,7 @@ public:
/** The meaning of 'value' changes for the specific type. /** The meaning of 'value' changes for the specific type.
@verbatim @verbatim
Document: empty Document: empty (NULL is returned, not an empty string)
Element: name of the element Element: name of the element
Comment: the comment text Comment: the comment text
Unknown: the tag contents Unknown: the tag contents

53
xmltest.cpp
View File

@ -30,7 +30,13 @@ int gFail = 0;
bool XMLTest (const char* testString, const char* expected, const char* found, bool echo=true, bool extraNL=false ) bool XMLTest (const char* testString, const char* expected, const char* found, bool echo=true, bool extraNL=false )
{ {
bool pass = !strcmp( expected, found ); bool pass;
if ( !expected && !found )
pass = true;
else if ( !expected || !found )
pass = false;
else
pass = !strcmp( expected, found );
if ( pass ) if ( pass )
printf ("[pass]"); printf ("[pass]");
else else
@ -1462,24 +1468,37 @@ int main( int argc, const char ** argv )
{ {
// Check that declarations are parsed only as the FirstChild // Check that declarations are parsed only as the FirstChild
const char* xml0 = "<?xml version=\"1.0\" ?>" const char* xml0 = "<?xml version=\"1.0\" ?>"
" <!-- xml version=\"1.1\" -->" " <!-- xml version=\"1.1\" -->"
"<first />"; "<first />";
const char* xml1 = "<?xml version=\"1.0\" ?>" const char* xml1 = "<?xml version=\"1.0\" ?>"
" <?xml version=\"1.1\" ?>" " <?xml version=\"1.1\" ?>"
"<first />"; "<first />";
const char* xml2 = "<first />" const char* xml2 = "<first />"
"<?xml version=\"1.0\" ?>"; "<?xml version=\"1.0\" ?>";
XMLDocument doc; XMLDocument doc;
doc.Parse(xml0); doc.Parse(xml0);
XMLTest("Test that the code changes do not affect normal parsing", doc.Error(), false); XMLTest("Test that the code changes do not affect normal parsing", doc.Error(), false);
doc.Parse(xml1); doc.Parse(xml1);
XMLTest("Test that the second declaration throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION); XMLTest("Test that the second declaration throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION);
doc.Parse(xml2); doc.Parse(xml2);
XMLTest("Test that declaration after a child throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION); XMLTest("Test that declaration after a child throws an error", doc.ErrorID(), XML_ERROR_PARSING_DECLARATION);
} }
// ----------- Performance tracking -------------- {
// No matter - before or after successfully parsing a text -
// calling XMLDocument::Value() causes an assert in debug.
const char* validXml = "<?xml version=\"1.0\" encoding=\"utf-8\" ?>"
"<first />"
"<second />";
XMLDocument* doc = new XMLDocument();
XMLTest( "XMLDocument::Value() returns null?", NULL, doc->Value() );
doc->Parse( validXml );
XMLTest( "XMLDocument::Value() returns null?", NULL, doc->Value() );
delete doc;
}
// ----------- Performance tracking --------------
{ {
#if defined( _MSC_VER ) #if defined( _MSC_VER )
__int64 start, end, freq; __int64 start, end, freq;