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

ValueFlow: Fix a few issues in 'evaluate'

This commit is contained in:
Daniel Marjamäki 2018-11-05 06:53:48 +01:00
parent 8a54420274
commit 977fdd88a9
1 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/valueflow.cpp
View File

@ -3309,6 +3309,27 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V
{ {
if (!expr) if (!expr)
return false; return false;
// unary operands
if (expr->astOperand1() && !expr->astOperand2()) {
std::list<ValueFlow::Value> opvalues;
if (!evaluate(expr->astOperand1(), values, &opvalues))
return false;
if (expr->str() == "+") {
result->swap(opvalues);
return true;
}
if (expr->str() == "-") {
for (ValueFlow::Value v: opvalues) {
if (v.isIntValue()) {
v.intvalue = -v.intvalue;
result->emplace_back(v);
}
}
return true;
}
return false;
}
// binary/ternary operands
if (expr->astOperand1() && expr->astOperand2()) { if (expr->astOperand1() && expr->astOperand2()) {
std::list<ValueFlow::Value> lhsValues, rhsValues; std::list<ValueFlow::Value> lhsValues, rhsValues;
if (!evaluate(expr->astOperand1(), values, &lhsValues)) if (!evaluate(expr->astOperand1(), values, &lhsValues))
@ -3360,6 +3381,14 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V
result->emplace_back(ValueFlow::Value(val1.intvalue >= val2.intvalue)); result->emplace_back(ValueFlow::Value(val1.intvalue >= val2.intvalue));
else if (expr->str() == "<=") else if (expr->str() == "<=")
result->emplace_back(ValueFlow::Value(val1.intvalue <= val2.intvalue)); result->emplace_back(ValueFlow::Value(val1.intvalue <= val2.intvalue));
else if (expr->str() == "&&")
result->emplace_back(ValueFlow::Value(val1.intvalue && val2.intvalue));
else if (expr->str() == "||")
result->emplace_back(ValueFlow::Value(val1.intvalue || val2.intvalue));
else if (expr->str() == "<<")
result->emplace_back(ValueFlow::Value(val1.intvalue << val2.intvalue));
else if (expr->str() == ">>")
result->emplace_back(ValueFlow::Value(val1.intvalue >> val2.intvalue));
else else
return false; return false;
combineValueProperties(val1, val2, &result->back()); combineValueProperties(val1, val2, &result->back());
@ -3373,10 +3402,16 @@ static bool evaluate(const Token *expr, const std::vector<std::list<ValueFlow::V
} }
if (expr->isNumber()) { if (expr->isNumber()) {
result->emplace_back(ValueFlow::Value(MathLib::toLongNumber(expr->str()))); result->emplace_back(ValueFlow::Value(MathLib::toLongNumber(expr->str())));
result->back().setKnown();
return true; return true;
} }
if (expr->str() == "(" && Token::Match(expr->previous(), "strlen ( %name% )")) { if (expr->str() == "(" && Token::Match(expr->previous(), "strlen ( %name% )")) {
for (const ValueFlow::Value &argvalue : values[expr->next()->str()[3] - '1']) { if (expr->str().compare(0,3,"arg") != 0 || expr->str().size() != 4)
return false;
const char n = expr->str()[3];
if (n < '1' || n - '1' >= values.size())
return false;
for (const ValueFlow::Value &argvalue : values[n - '1']) {
if (argvalue.isTokValue() && argvalue.tokvalue->tokType() == Token::eString) { if (argvalue.isTokValue() && argvalue.tokvalue->tokType() == Token::eString) {
ValueFlow::Value res(argvalue); // copy all "inconclusive", "condition", etc attributes ValueFlow::Value res(argvalue); // copy all "inconclusive", "condition", etc attributes
// set return value.. // set return value..