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

More asserts in numbers parsing

This commit is contained in:
Dmitry-Me 2015-03-14 16:41:46 +03:00
parent 0f922e7c9a
commit bab9b6d59c
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tinyxml2.cpp
View File

@ -374,18 +374,23 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
--q; --q;
while ( *q != 'x' ) { while ( *q != 'x' ) {
unsigned int digit;
if ( *q >= '0' && *q <= '9' ) { if ( *q >= '0' && *q <= '9' ) {
ucs += mult * (*q - '0'); digit = *q - '0';
} }
else if ( *q >= 'a' && *q <= 'f' ) { else if ( *q >= 'a' && *q <= 'f' ) {
ucs += mult * (*q - 'a' + 10); digit = *q - 'a' + 10;
} }
else if ( *q >= 'A' && *q <= 'F' ) { else if ( *q >= 'A' && *q <= 'F' ) {
ucs += mult * (*q - 'A' + 10 ); digit = *q - 'A' + 10;
} }
else { else {
return 0; return 0;
} }
TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
const unsigned int digitScaled = mult * digit;
TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
ucs += digitScaled;
TIXMLASSERT( mult <= UINT_MAX / 16 ); TIXMLASSERT( mult <= UINT_MAX / 16 );
mult *= 16; mult *= 16;
--q; --q;
@ -410,7 +415,11 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
while ( *q != '#' ) { while ( *q != '#' ) {
if ( *q >= '0' && *q <= '9' ) { if ( *q >= '0' && *q <= '9' ) {
ucs += mult * (*q - '0'); const unsigned int digit = *q - '0';
TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
const unsigned int digitScaled = mult * digit;
TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
ucs += digitScaled;
} }
else { else {
return 0; return 0;