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

Fixed #8348 (ValueFlow: wrong Uninit value with abort() in else-branch)

This commit is contained in:
Daniel Marjamäki 2018-02-11 22:14:44 +01:00
parent 8ef56972da
commit e62b9bdc77
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/valueflow.cpp
View File

@ -1459,7 +1459,8 @@ static bool valueFlowForward(Token * const startToken,
}
bool bailoutflag = false;
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end(); ++it) {
const Token * const start1 = iselse ? tok2->link()->linkAt(-2) : nullptr;
for (std::list<ValueFlow::Value>::const_iterator it = values.begin(); it != values.end();) {
if (!iselse && conditionIsTrue(condition, getProgramMemory(condition->astParent(), varid, *it))) {
bailoutflag = true;
break;
@ -1468,12 +1469,19 @@ static bool valueFlowForward(Token * const startToken,
bailoutflag = true;
break;
}
if (iselse && it->isPossible() && isVariableChanged(start1, start1->link(), varid, var->isGlobal(), settings))
values.erase(it++);
else
++it;
}
if (bailoutflag) {
if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok2, "variable " + var->name() + " valueFlowForward, conditional return is assumed to be executed");
return false;
}
if (values.empty())
return true;
} else if (indentlevel <= 0 &&
Token::simpleMatch(tok2->link()->previous(), "else {") &&
!isReturnScope(tok2->link()->tokAt(-2)) &&

15
test/testvalueflow.cpp
View File

@ -42,10 +42,11 @@ private:
Settings settings;
void run() {
// strcpy cfg
// strcpy, abort cfg
const char cfg[] = "<?xml version=\"1.0\"?>\n"
"<def>\n"
" <function name=\"strcpy\"> <arg nr=\"1\"><not-null/></arg> </function>\n"
" <function name=\"abort\"> <noreturn>true</noreturn> </function>\n" // abort is a noreturn function
"</def>";
settings.library.loadxmldata(cfg, sizeof(cfg));
@ -2770,6 +2771,18 @@ private:
"}";
values = tokenValues(code, "x >");
ASSERT_EQUALS(true, values.size() == 1U && values.front().isIntValue());
// #8348 - noreturn else
code = "int test_input_int(int a, int b) {\n"
" int x;\n"
" if (a == 1)\n"
" x = b;\n"
" else\n"
" abort();\n"
" a = x + 1;\n"
"}\n";
values = tokenValues(code, "x +");
ASSERT_EQUALS(true, values.empty());
}
};