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

Fixed #2885 (crash of cppcheck while checking gcc-testsuite)

This commit is contained in:
Daniel Marjamäki 2011-07-21 16:13:35 +02:00
parent 31e3844f3f
commit fb3870071a
2 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/tokenize.cpp
View File

@ -5323,7 +5323,9 @@ void Tokenizer::simplifyConditionOperator()
}
std::string str("if ( " + condition + " ) { " + var + " = " + value1 + " ; } else { " + var + " = " + value2 + " ; }");
Token *starttok = 0;
const std::string str("if ( condition ) { var = value1 ; } else { var = value2 ; }");
std::string::size_type pos1 = 0;
while (pos1 != std::string::npos)
{
@ -5339,19 +5341,23 @@ void Tokenizer::simplifyConditionOperator()
pos1 = pos2 + 1;
}
tok = tok->next();
}
if (isPointer)
{
Token::createMutualLinks(tok->tokAt(-17), tok->tokAt(-15));
Token::createMutualLinks(tok->tokAt(-14), tok->tokAt(-8));
Token::createMutualLinks(tok->tokAt(-6), tok);
}
else
{
Token::createMutualLinks(tok->tokAt(-15), tok->tokAt(-13));
Token::createMutualLinks(tok->tokAt(-12), tok->tokAt(-7));
Token::createMutualLinks(tok->tokAt(-5), tok);
// set links.
if (tok->str() == "(" || tok->str() == "{")
starttok = tok;
else if (starttok && (tok->str() == ")" || tok->str() == "}"))
{
Token::createMutualLinks(starttok, tok);
starttok = 0;
}
else if (tok->str() == "condition")
tok->str(condition);
else if (tok->str() == "var")
tok->str(var);
else if (tok->str() == "value1")
tok->str(value1);
else if (tok->str() == "value2")
tok->str(value2);
}
}
}

6
test/testsimplifytokens.cpp
View File

@ -2739,6 +2739,12 @@ private:
"}\n";
ASSERT_EQUALS("int f ( int b , int * d ) { if ( b ) { b ++ ; } if ( b ) { * d = b ; } else { * d = 10 ; } return * d ; }", tok(code));
}
{
// Ticket #2885
const char code[] = "; s = x ? \" \" : \"-\" ;";
tok(code);
}
}
void calculations()