potok/tinyxml2
1
0
Fork 0
Code Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #496 from Dmitry-Me/detectDeclarationPlacement

Browse Source 
Declarations should occur before anything else
This commit is contained in:
Lee Thomason
2016-11-15 14:08:04 -08:00
committed by GitHub
parent cd47f8e0d3 446c3bcae3
commit d04f21cab8
2 changed files with 28 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tinyxml2.cpp
View File

@@ -982,13 +982,23 @@ char* XMLNode::ParseDeep( char* p, StrPair* parentEnd )
XMLDeclaration* decl = node->ToDeclaration();
if ( decl ) {
// A declaration can only be the first child of a document.
// Set error, if document already has children.
if ( !_document->NoChildren() ) {
_document->SetError( XML_ERROR_PARSING_DECLARATION, decl->Value(), 0);
DeleteNode( node );
// Declarations are only allowed at document level
bool wellLocated = ( ToDocument() != 0 );
if ( wellLocated ) {
// Multiple declarations are allowed but all declarations
// must occur before anything else
for ( const XMLNode* existingNode = _document->FirstChild(); existingNode; existingNode = existingNode->NextSibling() ) {
if ( !existingNode->ToDeclaration() ) {
wellLocated = false;
break;
}
}
}
if ( !wellLocated ) {
_document->SetError( XML_ERROR_PARSING_DECLARATION, decl->Value(), 0 );
DeleteNode( node );
break;
}
}
XMLElement* ele = node->ToElement();