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

Fixed #903 (segmentation fault of cppcheck) 

http://sourceforge.net/apps/trac/cppcheck/ticket/903
This commit is contained in:
Slava Semushin 2009-11-13 00:41:35 +06:00
parent c337b4eb33
commit b6cda12251
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/tokenize.cpp
View File

@ -3198,6 +3198,8 @@ void Tokenizer::simplifyIfAssign()
if (tok3 && indentlevel == 1) if (tok3 && indentlevel == 1)
{ {
tok3 = tok3->previous(); tok3 = tok3->previous();
std::list<Token *> braces2;
for (tok2 = tok2->next(); tok2 && tok2 != tok; tok2 = tok2->previous()) for (tok2 = tok2->next(); tok2 && tok2 != tok; tok2 = tok2->previous())
{ {
tok3->insertToken(tok2->strAt(0)); tok3->insertToken(tok2->strAt(0));
@ -3211,11 +3213,20 @@ void Tokenizer::simplifyIfAssign()
{ {
braces.push_back(newTok); braces.push_back(newTok);
} }
else if (newTok->str() == "]")
{
braces2.push_back(newTok);
}
else if (newTok->str() == "(") else if (newTok->str() == "(")
{ {
Token::createMutualLinks(newTok, braces.back()); Token::createMutualLinks(newTok, braces.back());
braces.pop_back(); braces.pop_back();
} }
else if (newTok->str() == "[")
{
Token::createMutualLinks(newTok, braces2.back());
braces2.pop_back();
}
} }
} }
} }