commit 7265b763fcf3e0b2a26564f9b2b79bb591157dc3
author Lee Thomason <leethomason@gmail.com> Sun Mar 15 16:11:47 2015 -0700
committer Lee Thomason <leethomason@gmail.com> Sun Mar 15 16:11:47 2015 -0700
tree de6861d1ee245bb4d847774ee44a6824f2f2e91d
parent bab9b6d59cef84e57259e98b4b61cbc143c7d357

merge change; add extra assert

tinyxml2.cpp

diff --git a/tinyxml2.cpp b/tinyxml2.cpp
index 32ad143..66fa560 100755
--- a/tinyxml2.cpp
+++ b/tinyxml2.cpp
@@ -374,7 +374,8 @@
             --q;

 

             while ( *q != 'x' ) {

-                unsigned int digit;

+                unsigned int digit = 0;

+

                 if ( *q >= '0' && *q <= '9' ) {

                     digit = *q - '0';

                 }

@@ -388,6 +389,7 @@
                     return 0;

                 }

                 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;