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

Fix 10788: False positive: zerodivcond when using an assert (#3816)

This commit is contained in:
Paul Fultz II 2022-02-10 13:22:14 -06:00 committed by GitHub
parent ddd84f9b98
commit 5d25050b06
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/programmemory.cpp
View File

@ -559,7 +559,9 @@ static ValueFlow::Value evaluate(const std::string& op, const ValueFlow::Value&
return result;
}
static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings* settings = nullptr)
static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings* settings = nullptr);
static ValueFlow::Value executeImpl(const Token* expr, ProgramMemory& pm, const Settings* settings)
{
ValueFlow::Value unknown = ValueFlow::Value::unknown();
const ValueFlow::Value* value = nullptr;
@ -743,6 +745,29 @@ static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Sett
return unknown;
}
static ValueFlow::Value execute(const Token* expr, ProgramMemory& pm, const Settings* settings)
{
ValueFlow::Value v = executeImpl(expr, pm, settings);
if (!v.isUninitValue())
return v;
if (!expr)
return v;
if (pm.hasValue(expr->exprId()))
return pm.at(expr->exprId());
// Find symbolic values
for (const ValueFlow::Value& value : expr->values()) {
if (!value.isSymbolicValue())
continue;
if (!pm.hasValue(value.tokvalue->exprId()))
continue;
ValueFlow::Value v2 = pm.at(value.tokvalue->exprId());
v2.intvalue += value.intvalue;
v2.valueKind = value.valueKind;
return v2;
}
return v;
}
void execute(const Token* expr,
ProgramMemory* const programMemory,
MathLib::bigint* result,

7
test/testvalueflow.cpp
View File

@ -6933,6 +6933,13 @@ private:
"}\n";
ASSERT_EQUALS(false, testValueOfX(code, 4U, 71));
TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 4U, 56));
code = "int b(int a) {\n"
" unsigned long x = a ? 6 : 4;\n"
" assert(x < 6 && x > 0);\n"
" return 1 / x;\n"
"}\n";
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
}
void valueFlowSymbolicIdentity()