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

Fixed ticket #3572 (segmentation fault).

This commit is contained in:
Edoardo Prezioso 2012-01-31 22:32:28 +01:00
parent bc034095f1
commit f9ade9562c
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/tokenize.cpp
View File

@ -4432,26 +4432,40 @@ void Tokenizer::simplifyConditionOperator()
for (Token *tok = _tokens; tok; tok = tok->next()) {
if (tok->str() == "(")
++parlevel;
else if (tok->str() == ")")
else if (tok->str() == ")") {
if (!parlevel)
break;
--parlevel;
else if (parlevel == 0 && (Token::Match(tok, ";|{|} *| %any% = %any% ? %any% : %any% ;") ||
Token::Match(tok, ";|{|} return %any% ? %any% : %any% ;"))) {
}
if (parlevel)
continue;
if (Token::Match(tok, "[{};] *| %var% = %any% ? %any% : %any% ;") ||
Token::Match(tok, "[{};] return %any% ? %any% : %any% ;")) {
std::string var(tok->next()->str());
bool isPointer = false;
bool isReturn = false;
int offset = 0;
if (tok->next()->str() == "*") {
tok = tok->next();
var += " " + tok->next()->str();
isPointer = true;
} else if (tok->next()->str() == "return") {
isReturn = true;
offset = -1;
}
const std::string condition(tok->strAt(3 + offset));
const std::string value1(tok->strAt(5 + offset));
const std::string value2(tok->strAt(7 + offset));
Token *tok2 = tok->tokAt(3 - (isReturn ? 1 : 0));
if (!tok2->isName() && !tok2->isNumber() && tok2->str()[0] != '\"')
continue;
const std::string condition(tok2->str());
tok2 = tok2->tokAt(2);
if (!tok2->isName() && !tok2->isNumber() && tok2->str()[0] != '\"')
continue;
const std::string value1(tok2->str());
tok2 = tok2->tokAt(2);
if (!tok2->isName() && !tok2->isNumber() && tok2->str()[0] != '\"')
continue;
const std::string value2(tok2->str());
if (isPointer) {
tok = tok->previous();

7
test/testsimplifytokens.cpp
View File

@ -2746,9 +2746,12 @@ private:
{
// Ticket #2885
const char code[] = "; s = x ? \" \" : \"-\" ;";
tok(code);
const char code[] = "; const char *cx16 = has_cmpxchg16b ? \" -mcx16\" : \" -mno-cx16\";";
const char expected[] = "; const char * cx16 ; if ( has_cmpxchg16b ) { cx16 = \" -mcx16\" ; } else { cx16 = \" -mno-cx16\" ; }";
ASSERT_EQUALS(expected, tok(code));
}
// Ticket #3572 (segmentation fault)
ASSERT_EQUALS("0 ; x = { ? y : z ; }", tok("0; x = { ? y : z; }"));
}
void calculations() {