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

Fixed #9008 (new crash in clang test suite)

This commit is contained in:
Daniel Marjamäki 2019-02-28 20:34:07 +01:00
parent 71b1b2dd76
commit 5563fef7bb
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/valueflow.cpp
View File

@ -2398,10 +2398,13 @@ static bool valueFlowForward(Token * const startToken,
valueFlowAST(const_cast<Token*>(op2), varid, v, settings); valueFlowAST(const_cast<Token*>(op2), varid, v, settings);
} }
const std::pair<const Token *, const Token *> expr0 = op2->astOperand1()->findExpressionStartEndTokens(); const Token * const expr0 = op2->astOperand1() ? op2->astOperand1() : tok2->astOperand1();
const std::pair<const Token *, const Token *> expr1 = op2->astOperand2()->findExpressionStartEndTokens(); const Token * const expr1 = op2->astOperand2();
const bool changed0 = isVariableChanged(expr0.first, expr0.second->next(), varid, var->isGlobal(), settings, tokenlist->isCPP());
const bool changed1 = isVariableChanged(expr1.first, expr1.second->next(), varid, var->isGlobal(), settings, tokenlist->isCPP()); const std::pair<const Token *, const Token *> startEnd0 = expr0->findExpressionStartEndTokens();
const std::pair<const Token *, const Token *> startEnd1 = expr1->findExpressionStartEndTokens();
const bool changed0 = isVariableChanged(startEnd0.first, startEnd0.second->next(), varid, var->isGlobal(), settings, tokenlist->isCPP());
const bool changed1 = isVariableChanged(startEnd1.first, startEnd1.second->next(), varid, var->isGlobal(), settings, tokenlist->isCPP());
if (changed0 && changed1) { if (changed0 && changed1) {
if (settings->debugwarnings) if (settings->debugwarnings)

6
test/testvalueflow.cpp
View File

@ -2312,6 +2312,12 @@ private:
"}"; "}";
ASSERT_EQUALS(true, testValueOfX(code, 3U, 5)); ASSERT_EQUALS(true, testValueOfX(code, 3U, 5));
ASSERT_EQUALS(false, testValueOfX(code, 4U, 5)); ASSERT_EQUALS(false, testValueOfX(code, 4U, 5));
code = "int f(int *p) {\n" // #9008 - gcc ternary ?:
" if (p) return;\n"
" x = *p ? : 1;\n" // <- no explicit expr0
"}";
testValueOfX(code, 1U, 0); // do not crash
} }
void valueFlowForwardLambda() { void valueFlowForwardLambda() {