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

Merge branch 'master' of https://github.com/leethomason/tinyxml2

Browse Source
This commit is contained in:
Josh Wittner
2016-10-11 19:00:53 -07:00
parent cf3dd09b08 e8157ff9ae
commit 513e69ba68
4 changed files with 27 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tinyxml2.cpp
View File

@@ -191,6 +191,7 @@ void StrPair::SetStr( const char* str, int flags )
char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
{
TIXMLASSERT( p );
TIXMLASSERT( endTag && *endTag );
char* start = p;
@@ -204,6 +205,7 @@ char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
return p + length;
}
++p;
TIXMLASSERT( p );
}
return 0;
}
@@ -281,7 +283,8 @@ const char* StrPair::GetStr()
else {
++p;
}
*q++ = LF;
*q = LF;
++q;
}
else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) {
if ( *(p+1) == CR ) {
@@ -290,7 +293,8 @@ const char* StrPair::GetStr()
else {
++p;
}
*q++ = LF;
*q = LF;
++q;
}
else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) {
// Entities handled by tinyXML2:
@@ -2261,7 +2265,8 @@ XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) :
}
for( int i=0; i<NUM_ENTITIES; ++i ) {
const char entityValue = entities[i].value;
TIXMLASSERT( 0 <= entityValue && entityValue < ENTITY_RANGE );
// cast to explicit signed because char may be unsigned (on PowerPC)
TIXMLASSERT( 0 <= static_cast<signed char>(entityValue) && entityValue < ENTITY_RANGE );
_entityFlag[ (unsigned char)entityValue ] = true;
}
_restrictedEntityFlag[(unsigned char)'&'] = true;