v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #484 from turol/master 

Fix read past end of buffer after call to TokenMatch
pull/490/head
Alexander Gessler 2015-03-10 00:29:25 +01:00
parent 7d3d66936b ba4689fd05
commit 3c56e978f7
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
code/ParsingUtils.h
View File

@ -201,7 +201,12 @@ template <class char_t>
AI_FORCE_INLINE bool TokenMatch(char_t*& in, const char* token, unsigned int len) AI_FORCE_INLINE bool TokenMatch(char_t*& in, const char* token, unsigned int len)
{ {
if (!::strncmp(token,in,len) && IsSpaceOrNewLine(in[len])) { if (!::strncmp(token,in,len) && IsSpaceOrNewLine(in[len])) {
if (in[len] != '\0') {
in += len+1; in += len+1;
} else {
// If EOF after the token make sure we don't go past end of buffer
in += len;
}
return true; return true;
} }