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

Merge pull request #272 from Dmitry-Me/properTreatStrchrPostConditions 

strchr() can only find what is was asked for
This commit is contained in:
Lee Thomason 2015-01-12 13:58:15 -08:00
parent d15686653a 9f56e12c16
commit ba7d9df976
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tinyxml2.cpp
View File

@ -353,6 +353,7 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
unsigned long ucs = 0;
ptrdiff_t delta = 0;
unsigned mult = 1;
const char semicolon = ';';
if ( *(p+2) == 'x' ) {
// Hexadecimal.
@ -361,11 +362,12 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
}
const char* q = p+3;
q = strchr( q, ';' );
q = strchr( q, semicolon );
if ( !q || !*q ) {
if ( !q ) {
return 0;
}
TIXMLASSERT( *q == semicolon );
delta = q-p;
--q;
@ -394,11 +396,12 @@ const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length )
}
const char* q = p+2;
q = strchr( q, ';' );
q = strchr( q, semicolon );
if ( !q || !*q ) {
if ( !q ) {
return 0;
}
TIXMLASSERT( *q == semicolon );
delta = q-p;
--q;