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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Lee Thomason 2014-08-27 14:45:53 -07:00
parent d526944e3c 59b9aaea43
commit 83a6d8c373
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tinyxml2.cpp
View File

@ -112,7 +112,7 @@ char* StrPair::ParseText( char* p, const char* endTag, int strFlags )
{ {
TIXMLASSERT( endTag && *endTag ); TIXMLASSERT( endTag && *endTag );
char* start = p; // fixme: hides a member char* start = p;
char endChar = *endTag; char endChar = *endTag;
size_t length = strlen( endTag ); size_t length = strlen( endTag );
@ -216,13 +216,14 @@ const char* StrPair::GetStr()
// 中 or 中 // 中 or 中
if ( *(p+1) == '#' ) { if ( *(p+1) == '#' ) {
char buf[10] = { 0 }; const int buflen = 10;
int len; char buf[buflen] = { 0 };
int len = 0;
p = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) ); p = const_cast<char*>( XMLUtil::GetCharacterRef( p, buf, &len ) );
for( int i=0; i<len; ++i ) { TIXMLASSERT( 0 <= len && len <= buflen );
*q++ = buf[i]; TIXMLASSERT( q + len <= p );
} memcpy( q, buf, len );
TIXMLASSERT( q <= p ); q += len;
} }
else { else {
int i=0; int i=0;