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

Merge pull request #2790 from pfultz2/forward-analyze-accumulate-actions 

Fix issue 9833: False positive: Division by zero when using pointer to struct
This commit is contained in:
Daniel Marjamäki 2020-09-11 07:17:10 +02:00 committed by GitHub
parent 2b12ef653d 6394ad2643
commit ac66f67bad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 121 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/forwardanalyzer.cpp
View File

@ -10,8 +10,18 @@
struct ForwardTraversal {
enum class Progress { Continue, Break, Skip };
ForwardTraversal(const ValuePtr<ForwardAnalyzer>& analyzer, const Settings* settings)
: analyzer(analyzer), settings(settings), actions(ForwardAnalyzer::Action::None), analyzeOnly(false)
{}
ValuePtr<ForwardAnalyzer> analyzer;
const Settings* settings;
ForwardAnalyzer::Action actions;
bool analyzeOnly;
bool stopUpdates() {
analyzeOnly = true;
return actions.isModified();
}
std::pair<bool, bool> evalCond(const Token* tok) {
std::vector<int> result = analyzer->evaluate(tok);
@ -91,7 +101,7 @@ struct ForwardTraversal {
std::tie(checkThen, checkElse) = evalCond(condTok);
if (!checkThen && !checkElse) {
// Stop if the value is conditional
if (!traverseUnknown && analyzer->isConditional())
if (!traverseUnknown && analyzer->isConditional() && stopUpdates())
return Progress::Break;
checkThen = true;
checkElse = true;
@ -115,7 +125,8 @@ struct ForwardTraversal {
Progress update(Token* tok) {
ForwardAnalyzer::Action action = analyzer->analyze(tok);
if (!action.isNone())
actions |= action;
if (!action.isNone() && !analyzeOnly)
analyzer->update(tok, action);
if (action.isInconclusive() && !analyzer->lowerToInconclusive())
return Progress::Break;
@ -225,6 +236,7 @@ struct ForwardTraversal {
allAnalysis |= analyzeRecursive(initTok);
if (stepTok)
allAnalysis |= analyzeRecursive(stepTok);
actions |= allAnalysis;
if (allAnalysis.isInconclusive()) {
if (!analyzer->lowerToInconclusive())
return Progress::Break;
@ -399,6 +411,7 @@ struct ForwardTraversal {
} else {
tok = endBlock;
}
actions |= (thenAction | elseAction);
if (bail)
return Progress::Break;
if (returnThen && returnElse)
@ -412,7 +425,7 @@ struct ForwardTraversal {
if (checkThen) {
return Progress::Break;
} else {
if (analyzer->isConditional())
if (analyzer->isConditional() && stopUpdates())
return Progress::Break;
analyzer->assume(condTok, false);
}
@ -421,7 +434,7 @@ struct ForwardTraversal {
if (!analyzer->lowerToInconclusive())
return Progress::Break;
} else if (thenAction.isModified() || elseAction.isModified()) {
if (!hasElse && analyzer->isConditional())
if (!hasElse && analyzer->isConditional() && stopUpdates())
return Progress::Break;
if (!analyzer->lowerToPossible())
return Progress::Break;
@ -552,8 +565,12 @@ struct ForwardTraversal {
};
void valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<ForwardAnalyzer>& fa, const Settings* settings)
ForwardAnalyzer::Action valueFlowGenericForward(Token* start,
const Token* end,
const ValuePtr<ForwardAnalyzer>& fa,
const Settings* settings)
{
ForwardTraversal ft{fa, settings};
ft.updateRange(start, end);
return ft.actions;
}

5
lib/forwardanalyzer.h
View File

@ -113,6 +113,9 @@ struct ForwardAnalyzer {
virtual ~ForwardAnalyzer() {}
};
void valueFlowGenericForward(Token* start, const Token* end, const ValuePtr<ForwardAnalyzer>& fa, const Settings* settings);
ForwardAnalyzer::Action valueFlowGenericForward(Token* start,
const Token* end,
const ValuePtr<ForwardAnalyzer>& fa,
const Settings* settings);
#endif

70
lib/valueflow.cpp
View File

@ -1710,7 +1710,7 @@ static void valueFlowGlobalStaticVar(TokenList *tokenList, const Settings *setti
}
}
static void valueFlowForwardVariable(Token* const startToken,
static ForwardAnalyzer::Action valueFlowForwardVariable(Token* const startToken,
const Token* const endToken,
const Variable* const var,
std::list<ValueFlow::Value> values,
@ -2697,7 +2697,7 @@ static std::vector<const Variable*> getAliasesFromValues(std::list<ValueFlow::Va
return aliases;
}
static void valueFlowForwardVariable(Token* const startToken,
static ForwardAnalyzer::Action valueFlowForwardVariable(Token* const startToken,
const Token* const endToken,
const Variable* const var,
std::list<ValueFlow::Value> values,
@ -2705,20 +2705,23 @@ static void valueFlowForwardVariable(Token* const startToken,
TokenList* const tokenlist,
const Settings* const settings)
{
ForwardAnalyzer::Action actions;
for (ValueFlow::Value& v : values) {
VariableForwardAnalyzer a(var, v, aliases, tokenlist);
valueFlowGenericForward(startToken, endToken, a, settings);
actions |= valueFlowGenericForward(startToken, endToken, a, settings);
}
return actions;
}
static void valueFlowForwardVariable(Token* const startToken,
static ForwardAnalyzer::Action valueFlowForwardVariable(Token* const startToken,
const Token* const endToken,
const Variable* const var,
std::list<ValueFlow::Value> values,
TokenList* const tokenlist,
const Settings* const settings)
{
valueFlowForwardVariable(startToken, endToken, var, std::move(values), getAliasesFromValues(values), tokenlist, settings);
return valueFlowForwardVariable(
startToken, endToken, var, std::move(values), getAliasesFromValues(values), tokenlist, settings);
}
// Old deprecated version
@ -2805,17 +2808,19 @@ struct ExpressionForwardAnalyzer : SingleValueFlowForwardAnalyzer {
}
};
static void valueFlowForwardExpression(Token* startToken,
static ForwardAnalyzer::Action valueFlowForwardExpression(Token* startToken,
const Token* endToken,
const Token* exprTok,
const std::list<ValueFlow::Value>& values,
const TokenList* const tokenlist,
const Settings* settings)
{
ForwardAnalyzer::Action actions;
for (const ValueFlow::Value& v : values) {
ExpressionForwardAnalyzer a(exprTok, v, tokenlist);
valueFlowGenericForward(startToken, endToken, a, settings);
actions |= valueFlowGenericForward(startToken, endToken, a, settings);
}
return actions;
}
static const Token* parseBinaryIntOp(const Token* expr, MathLib::bigint& known)
@ -2879,7 +2884,7 @@ static const Token* solveExprValues(const Token* expr, std::list<ValueFlow::Valu
return expr;
}
static void valueFlowForward(Token* startToken,
static ForwardAnalyzer::Action valueFlowForward(Token* startToken,
const Token* endToken,
const Token* exprTok,
std::list<ValueFlow::Value> values,
@ -2888,14 +2893,9 @@ static void valueFlowForward(Token* startToken,
{
const Token* expr = solveExprValues(exprTok, values);
if (expr->variable()) {
valueFlowForwardVariable(startToken,
endToken,
expr->variable(),
values,
tokenlist,
settings);
return valueFlowForwardVariable(startToken, endToken, expr->variable(), values, tokenlist, settings);
} else {
valueFlowForwardExpression(startToken, endToken, expr, values, tokenlist, settings);
return valueFlowForwardExpression(startToken, endToken, expr, values, tokenlist, settings);
}
}
@ -4549,14 +4549,9 @@ static void valueFlowAfterCondition(TokenList *tokenlist,
const Settings *settings)
{
ValueFlowConditionHandler handler;
handler.forward = [&](Token* start,
const Token* stop,
const Token* vartok,
const std::list<ValueFlow::Value>& values,
bool) {
valueFlowForward(start->next(), stop, vartok, values, tokenlist, settings);
std::vector<const Variable*> vars = getExprVariables(vartok, tokenlist, symboldatabase, settings);
return isVariablesChanged(start, stop, 0, vars, settings, tokenlist->isCPP());
handler.forward =
[&](Token* start, const Token* stop, const Token* vartok, const std::list<ValueFlow::Value>& values, bool) {
return valueFlowForward(start->next(), stop, vartok, values, tokenlist, settings).isModified();
};
handler.parse = [&](const Token *tok) {
ValueFlowConditionHandler::Condition cond;
@ -5887,19 +5882,26 @@ struct ContainerVariableForwardAnalyzer : VariableForwardAnalyzer {
}
};
static void valueFlowContainerForward(Token *tok, const Token* endToken, const Variable* var, ValueFlow::Value value, TokenList *tokenlist)
static ForwardAnalyzer::Action valueFlowContainerForward(Token* tok,
const Token* endToken,
const Variable* var,
ValueFlow::Value value,
TokenList* tokenlist)
{
ContainerVariableForwardAnalyzer a(var, value, getAliasesFromValues({value}), tokenlist);
valueFlowGenericForward(tok, endToken, a, tokenlist->getSettings());
return valueFlowGenericForward(tok, endToken, a, tokenlist->getSettings());
}
static void valueFlowContainerForward(Token *tok, const Variable* var, ValueFlow::Value value, TokenList *tokenlist)
static ForwardAnalyzer::Action valueFlowContainerForward(Token* tok,
const Variable* var,
ValueFlow::Value value,
TokenList* tokenlist)
{
const Token * endOfVarScope = nullptr;
if (var->isLocal() || var->isArgument())
endOfVarScope = var->scope()->bodyEnd;
if (!endOfVarScope)
endOfVarScope = tok->scope()->bodyEnd;
valueFlowContainerForward(tok, endOfVarScope, var, std::move(value), tokenlist);
return valueFlowContainerForward(tok, endOfVarScope, var, std::move(value), tokenlist);
}
static bool isContainerSizeChanged(const Token *tok, int depth)
@ -6048,14 +6050,9 @@ static void valueFlowIteratorAfterCondition(TokenList *tokenlist,
const Settings *settings)
{
ValueFlowConditionHandler handler;
handler.forward = [&](Token* start,
const Token* stop,
const Token* vartok,
const std::list<ValueFlow::Value>& values,
bool) {
valueFlowForward(start->next(), stop, vartok, values, tokenlist, settings);
std::vector<const Variable*> vars = getExprVariables(vartok, tokenlist, symboldatabase, settings);
return isVariablesChanged(start, stop, 0, vars, settings, tokenlist->isCPP());
handler.forward =
[&](Token* start, const Token* stop, const Token* vartok, const std::list<ValueFlow::Value>& values, bool) {
return valueFlowForward(start->next(), stop, vartok, values, tokenlist, settings).isModified();
};
handler.parse = [&](const Token *tok) {
ValueFlowConditionHandler::Condition cond;
@ -6230,8 +6227,7 @@ static void valueFlowContainerAfterCondition(TokenList *tokenlist,
const Variable* var = vartok->variable();
if (!var)
return false;
valueFlowContainerForward(start->next(), stop, var, values.front(), tokenlist);
return isContainerSizeChanged(var->declarationId(), start, stop);
return valueFlowContainerForward(start->next(), stop, var, values.front(), tokenlist).isModified();
};
handler.parse = [&](const Token *tok) {
ValueFlowConditionHandler::Condition cond;

10
test/testother.cpp
View File

@ -697,6 +697,16 @@ private:
" a = b / -x;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("struct A {\n"
" int x;\n"
"};\n"
"int f(A* a) {\n"
" if (a->x == 0) \n"
" a->x = 1;\n"
" return 1/a->x;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void nanInArithmeticExpression() {

23
test/testvalueflow.cpp
View File

@ -2424,6 +2424,29 @@ private:
" }"
"}";
ASSERT_EQUALS(false, testValueOfXKnown(code, 3U, 2));
code = "int f(int i, int j) {\n"
" if (i == 0) {\n"
" if (j < 0)\n"
" return 0;\n"
" i = j+1;\n"
" }\n"
" int x = i;\n"
" return x;\n"
"}\n";
ASSERT_EQUALS(false, testValueOfX(code, 8U, 0));
code = "int f(int i, int j) {\n"
" if (i == 0) {\n"
" if (j < 0)\n"
" return 0;\n"
" if (j < 0)\n"
" i = j+1;\n"
" }\n"
" int x = i;\n"
" return x;\n"
"}\n";
ASSERT_EQUALS(true, testValueOfX(code, 9U, 0));
}
void valueFlowAfterConditionExpr() {