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

merge change; add extra assert

Browse Source
This commit is contained in:
Lee Thomason
2015-03-15 16:11:47 -07:00
parent bab9b6d59c
commit 7265b763fc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tinyxml2.cpp
View File

@@ -374,7 +374,8 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
--q; --q;
while ( *q != 'x' ) { while ( *q != 'x' ) {
unsigned int digit; unsigned int digit = 0;
if ( *q >= '0' && *q <= '9' ) { if ( *q >= '0' && *q <= '9' ) {
digit = *q - '0'; digit = *q - '0';
} }
@@ -388,6 +389,7 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
return 0; return 0;
} }
TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
TIXMLASSERT( digit >= 0 && digit < 16);
const unsigned int digitScaled = mult * digit; const unsigned int digitScaled = mult * digit;
TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
ucs += digitScaled; ucs += digitScaled;