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

Fixed crash on garbage code (#7118)

This commit is contained in:
PKEuS 2015-11-09 11:21:07 +01:00
parent c7987ad11a
commit 389d30fe44
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/valueflow.cpp
View File

@ -1369,17 +1369,18 @@ static bool valueFlowForward(Token * const startToken,
// If a ? is seen and it's known that the condition is true/false.. // If a ? is seen and it's known that the condition is true/false..
else if (tok2->str() == "?") { else if (tok2->str() == "?") {
const Token *condition = tok2->astOperand1(); const Token *condition = tok2->astOperand1();
if (!condition) // Ticket #6713 const Token *op2 = tok2->astOperand2();
if (!condition || !op2) // Ticket #6713
continue; continue;
std::list<ValueFlow::Value>::const_iterator it; std::list<ValueFlow::Value>::const_iterator it;
for (it = values.begin(); it != values.end(); ++it) { for (it = values.begin(); it != values.end(); ++it) {
const ProgramMemory programMemory(getProgramMemory(tok2, varid, *it)); const ProgramMemory programMemory(getProgramMemory(tok2, varid, *it));
if (conditionIsTrue(condition, programMemory)) if (conditionIsTrue(condition, programMemory))
valueFlowAST(const_cast<Token*>(tok2->astOperand2()->astOperand1()), varid, *it); valueFlowAST(const_cast<Token*>(op2->astOperand1()), varid, *it);
else if (conditionIsFalse(condition, programMemory)) else if (conditionIsFalse(condition, programMemory))
valueFlowAST(const_cast<Token*>(tok2->astOperand2()->astOperand2()), varid, *it); valueFlowAST(const_cast<Token*>(op2->astOperand2()), varid, *it);
else else
valueFlowAST(const_cast<Token*>(tok2->astOperand2()), varid, *it); valueFlowAST(const_cast<Token*>(op2), varid, *it);
} }
// Skip conditional expressions.. // Skip conditional expressions..
while (tok2->astOperand1() || tok2->astOperand2()) { while (tok2->astOperand1() || tok2->astOperand2()) {

6
test/testgarbage.cpp
View File

@ -203,7 +203,7 @@ private:
TEST_CASE(garbageCode152); // travis after 9c7271a5 TEST_CASE(garbageCode152); // travis after 9c7271a5
TEST_CASE(garbageCode153); TEST_CASE(garbageCode153);
TEST_CASE(garbageCode154); // #7112 TEST_CASE(garbageCode154); // #7112
TEST_CASE(garbageCode155); // #7118
TEST_CASE(garbageValueFlow); TEST_CASE(garbageValueFlow);
TEST_CASE(garbageSymbolDatabase); TEST_CASE(garbageSymbolDatabase);
@ -1223,6 +1223,10 @@ private:
checkCode("\"abc\"[];"); checkCode("\"abc\"[];");
} }
void garbageCode155() { // #7118
checkCode("&p(!{}e x){({(0?:?){({})}()})}");
}
void garbageValueFlow() { void garbageValueFlow() {
// #6089 // #6089
const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n" const char* code = "{} int foo(struct, x1, struct x2, x3, int, x5, x6, x7)\n"