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

Tokenizer(simplifyIfAssign): fixed to link() just inserted tokens. 

Fixed segfault on samba sources.
This commit is contained in:
Slava Semushin 2009-08-29 18:09:24 +07:00
parent d6017756f4
commit 840bbcfcbb
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tokenize.cpp
View File

@ -2683,9 +2683,22 @@ bool Tokenizer::simplifyIfAssign()
tok3 = tok3->previous(); tok3 = tok3->previous();
for (tok2 = tok2->next(); tok2 && tok2 != tok; tok2 = tok2->previous()) for (tok2 = tok2->next(); tok2 && tok2 != tok; tok2 = tok2->previous())
{ {
tok3->insertToken(tok2->str().c_str()); tok3->insertToken(tok2->strAt(0));
tok3->next()->fileIndex(tok2->fileIndex());
tok3->next()->linenr(tok2->linenr()); Token *newTok = tok3->next();
newTok->fileIndex(tok2->fileIndex());
newTok->linenr(tok2->linenr());
// link() newly tokens manually
if (newTok->str() == ")")
{
braces.push_back(newTok);
}
else if (newTok->str() == "(")
{
Token::createMutualLinks(newTok, braces.back());
braces.pop_back();
}
} }
} }
} }