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

Fix 11142: FP nullPointer before assignment (#4319) 

* Fix 11142: FP nullPointer before assignment

* Format

* Use simpleMatch
This commit is contained in:
Paul Fultz II 2022-08-03 12:05:07 -05:00 committed by GitHub
parent 6cb3a79a64
commit c0f55a2b85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/valueflow.cpp
View File

@ -3634,6 +3634,19 @@ static void valueFlowLifetimeConstructor(Token *tok,
ErrorLogger *errorLogger, ErrorLogger *errorLogger,
const Settings *settings); const Settings *settings);
static bool isRangeForScope(const Scope* scope)
{
if (!scope)
return false;
if (scope->type != Scope::eFor)
return false;
if (!scope->bodyStart)
return false;
if (!Token::simpleMatch(scope->bodyStart->previous(), ") {"))
return false;
return Token::simpleMatch(scope->bodyStart->linkAt(-1)->astOperand2(), ":");
}
static const Token* getEndOfVarScope(const Variable* var) static const Token* getEndOfVarScope(const Variable* var)
{ {
if (!var) if (!var)
@ -3651,7 +3664,8 @@ static const Token* getEndOfVarScope(const Variable* var)
// If the variable is defined in a for/while initializer then we want to // If the variable is defined in a for/while initializer then we want to
// pick one token after the end so forward analysis can analyze the exit // pick one token after the end so forward analysis can analyze the exit
// conditions // conditions
if (innerScope != outerScope && outerScope->isExecutable() && innerScope->isLocal()) if (innerScope != outerScope && outerScope->isExecutable() && innerScope->isLoopScope() &&
!isRangeForScope(innerScope))
return innerScope->bodyEnd->next(); return innerScope->bodyEnd->next();
return innerScope->bodyEnd; return innerScope->bodyEnd;
} }

11
test/testnullpointer.cpp
View File

@ -138,6 +138,7 @@ private:
TEST_CASE(nullpointer92); TEST_CASE(nullpointer92);
TEST_CASE(nullpointer93); // #3929 TEST_CASE(nullpointer93); // #3929
TEST_CASE(nullpointer94); // #11040 TEST_CASE(nullpointer94); // #11040
TEST_CASE(nullpointer95); // #11142
TEST_CASE(nullpointer_addressOf); // address of TEST_CASE(nullpointer_addressOf); // address of
TEST_CASE(nullpointerSwitch); // #2626 TEST_CASE(nullpointerSwitch); // #2626
TEST_CASE(nullpointer_cast); // #4692 TEST_CASE(nullpointer_cast); // #4692
@ -2751,6 +2752,16 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void nullpointer95() // #11142
{
check("void f(std::vector<int*>& v) {\n"
" for (auto& p : v)\n"
" if (*p < 2)\n"
" p = nullptr;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void nullpointer_addressOf() { // address of void nullpointer_addressOf() { // address of
check("void f() {\n" check("void f() {\n"
" struct X *x = 0;\n" " struct X *x = 0;\n"