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

fix merge

This commit is contained in:
Lee Thomason (grinliz) 2012-09-08 21:44:12 -07:00
parent 491d587484 5fbacbec06
commit 62d1c5a739
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tinyxml2.cpp
View File

@ -136,16 +136,12 @@ char* StrPair::ParseName( char* p )
return 0; return 0;
} }
if ( !XMLUtil::IsAlpha( *p ) ) {
return 0;
}
while( *p && ( while( *p && (
XMLUtil::IsAlphaNum( (unsigned char) *p ) XMLUtil::IsAlphaNum( (unsigned char) *p )
|| *p == '_' || *p == '_'
|| *p == '-' || *p == ':'
|| *p == '.' || (*p == '-' && p>start ) // can be in a name, but not lead it.
|| *p == ':' )) || (*p == '.' && p>start ) )) // can be in a name, but not lead it.
{ {
++p; ++p;
} }

8
xmltest.cpp
View File

@ -940,6 +940,13 @@ int main( int /*argc*/, const char ** /*argv*/ )
XMLTest( "QueryBoolText", boolValue, true, false ); XMLTest( "QueryBoolText", boolValue, true, false );
} }
{
const char* xml = "<element><_sub/><:sub/><sub:sub/><sub-sub/></element>";
XMLDocument doc;
doc.Parse( xml );
XMLTest( "Non-alpha element lead letter parses.", doc.Error(), false );
}
// ----------- Whitespace ------------ // ----------- Whitespace ------------
{ {
const char* xml = "<element>" const char* xml = "<element>"
@ -958,7 +965,6 @@ int main( int /*argc*/, const char ** /*argv*/ )
XMLTest( "Whitespace collapse", "This is ' text '", parent->GetText() ); XMLTest( "Whitespace collapse", "This is ' text '", parent->GetText() );
} }
} }
// ----------- Performance tracking -------------- // ----------- Performance tracking --------------
{ {