walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

tokenize: Fixed two bugs 

* don't hang if we can't find the ending of a string.
 * don't divide by zero
This commit is contained in:
Daniel Marjamäki 2008-03-19 17:09:51 +00:00
parent b1b7593c76
commit 506fc0e16d
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tokenize.cpp
View File

@ -466,7 +466,7 @@ void TokenizeCode(std::istream &code, const unsigned int FileIndex)
// Get next character // Get next character
c = (char)code.get(); c = (char)code.get();
} }
while (special || c != '\"'); while (!code.eof() && (special || c != '\"'));
*pToken = '\"'; *pToken = '\"';
addtoken(CurrentToken, lineno, FileIndex); addtoken(CurrentToken, lineno, FileIndex);
memset(CurrentToken, 0, sizeof(CurrentToken)); memset(CurrentToken, 0, sizeof(CurrentToken));
@ -808,10 +808,13 @@ void SimplifyTokenList()
IsNumber(getstr(tok,3)) && IsNumber(getstr(tok,3)) &&
strchr("],);=<>",*(getstr(tok,4))) ) strchr("],);=<>",*(getstr(tok,4))) )
{ {
done = false;
int i1 = atoi(getstr(tok,1)); int i1 = atoi(getstr(tok,1));
int i2 = atoi(getstr(tok,3)); int i2 = atoi(getstr(tok,3));
if ( i2 == 0 && *(getstr(tok,2)) == '/' )
{
continue;
}
switch (*(getstr(tok,2))) switch (*(getstr(tok,2)))
{ {
case '+': i1 += i2; break; case '+': i1 += i2; break;
@ -828,6 +831,8 @@ void SimplifyTokenList()
{ {
DeleteNextToken(tok); DeleteNextToken(tok);
} }
done = false;
} }
} }
} }