Better asserts in parsing
diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 6d8573b..48383d9 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -397,8 +397,8 @@
else {
return 0;
}
+ TIXMLASSERT( digit >= 0 && digit < 16);
TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
- TIXMLASSERT( digit >= 0 && digit < 16);
const unsigned int digitScaled = mult * digit;
TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );
ucs += digitScaled;
@@ -427,6 +427,7 @@
while ( *q != '#' ) {
if ( *q >= '0' && *q <= '9' ) {
const unsigned int digit = *q - '0';
+ TIXMLASSERT( digit >= 0 && digit < 10);
TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit );
const unsigned int digitScaled = mult * digit;
TIXMLASSERT( ucs <= ULONG_MAX - digitScaled );