Skip to content

Commit 23ec9fe

Browse files
committed
Fixed cppcheck-opensource#6024 (False positive (nullPointer) using in 1.66)
1 parent 630211a commit 23ec9fe

2 files changed

Lines changed: 34 additions & 1 deletion

File tree

‎lib/valueflow.cpp‎

Lines changed: 25 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,24 @@ static bool bailoutSelfAssignment(const Token * const tok)
231231
return false;
232232
}
233233

234+
static bool isReturn(const Token *tok)
235+
{
236+
const Token *prev = tok ? tok->previous() : nullptr;
237+
if (Token::simpleMatch(prev, "}") && Token::simpleMatch(prev->link()->tokAt(-2),"} else {"))
238+
return isReturn(prev) && isReturn(prev->link()->tokAt(-2));
239+
if (Token::simpleMatch(prev, ";")) {
240+
// noreturn function
241+
if (Token::simpleMatch(prev->previous(), ") ;") && Token::Match(prev->linkAt(-1)->tokAt(-2), "[;{}] %var% ("))
242+
return true;
243+
// return statement
244+
prev = prev->previous();
245+
while (prev && !Token::Match(prev,"[;{}]"))
246+
prev = prev->previous();
247+
return Token::Match(prev, "[;{}] return");
248+
}
249+
return false;
250+
}
251+
234252
static bool isVariableChanged(const Token *start, const Token *end, const unsigned int varid)
235253
{
236254
for (const Token *tok = start; tok != end; tok = tok->next()) {
@@ -1014,15 +1032,21 @@ static void valueFlowAfterCondition(TokenList *tokenlist, ErrorLogger *errorLogg
10141032
bailout(tokenlist, errorLogger, after, "possible noreturn scope");
10151033
continue;
10161034
}
1035+
1036+
bool isreturn = (codeblock == 1 && isReturn(after));
1037+
10171038
if (Token::simpleMatch(after, "} else {")) {
10181039
after = after->linkAt(2);
10191040
if (Token::simpleMatch(after->tokAt(-2), ") ; }")) {
10201041
if (settings->debugwarnings)
10211042
bailout(tokenlist, errorLogger, after, "possible noreturn scope");
10221043
continue;
10231044
}
1045+
isreturn |= (codeblock == 2 && isReturn(after));
10241046
}
1025-
valueFlowForward(after->next(), top->scope()->classEnd, var, varid, values, true, tokenlist, errorLogger, settings);
1047+
1048+
if (!isreturn)
1049+
valueFlowForward(after->next(), top->scope()->classEnd, var, varid, values, true, tokenlist, errorLogger, settings);
10261050
}
10271051
}
10281052
}

‎test/testvalueflow.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -998,6 +998,15 @@ class TestValueFlow : public TestFixture {
998998
TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 3U, 0));
999999
ASSERT_EQUALS(false, testValueOfX(code, 4U, 0));
10001000

1001+
// stop at return
1002+
code = "void f(int x) {\n"
1003+
" if (x == 5) {\n"
1004+
" if (z) return; else return;\n"
1005+
" }\n"
1006+
" a = x;\n"
1007+
"}";
1008+
ASSERT_EQUALS(false, testValueOfX(code, 5U, 5));
1009+
10011010
// TODO: float
10021011
code = "void f(float x) {\n"
10031012
" if (x == 0.5) {}\n"

0 commit comments

Comments
 (0)