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

Fixed #2350 (false positive: possible null pointer dereference)

This commit is contained in:
Daniel Marjamäki 2010-12-26 13:38:16 +01:00
parent f7a83b4d90
commit 243a524909
2 changed files with 49 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/executionpath.cpp
View File

@ -265,6 +265,17 @@ void ExecutionPath::checkScope(const Token *tok, std::list<ExecutionPath *> &che
if (tok3->varId()) if (tok3->varId())
ExecutionPath::bailOutVar(checks, tok3->varId()); ExecutionPath::bailOutVar(checks, tok3->varId());
} }
// it is not certain that a for/while will be executed:
for (std::list<ExecutionPath *>::iterator it = checks.begin(); it != checks.end();)
{
if ((*it)->numberOfIf > 0)
checks.erase(it++);
else
++it;
}
// parse loop bodies
check->parseLoopBody(tok2->next(), checks); check->parseLoopBody(tok2->next(), checks);
} }

40
test/testnullpointer.cpp
View File

@ -39,7 +39,8 @@ private:
TEST_CASE(structDerefAndCheck); // dereferencing struct and then checking if it's null TEST_CASE(structDerefAndCheck); // dereferencing struct and then checking if it's null
TEST_CASE(pointerDerefAndCheck); TEST_CASE(pointerDerefAndCheck);
TEST_CASE(nullpointer5); // References should not be checked TEST_CASE(nullpointer5); // References should not be checked
TEST_CASE(nullpointer6); TEST_CASE(nullpointerExecutionPaths);
TEST_CASE(nullpointerExecutionPathsLoop);
TEST_CASE(nullpointer7); TEST_CASE(nullpointer7);
TEST_CASE(nullpointer8); TEST_CASE(nullpointer8);
TEST_CASE(nullpointer9); TEST_CASE(nullpointer9);
@ -410,7 +411,7 @@ private:
} }
// Execution paths.. // Execution paths..
void nullpointer6() void nullpointerExecutionPaths()
{ {
// errors.. // errors..
check("static void foo()\n" check("static void foo()\n"
@ -634,6 +635,41 @@ private:
} }
// Ticket #2350
void nullpointerExecutionPathsLoop()
{
// No false positive:
check("void foo() {\n"
" int n;\n"
" int *argv32;\n"
" if (x) {\n"
" n = 0;\n"
" argv32 = 0;\n"
" }\n"
"\n"
" for (int i = 0; i < n; i++) {\n"
" argv32[i] = 0;\n"
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());
// No false negative:
check("void foo() {\n"
" int n;\n"
" int *argv32;\n"
" if (x) {\n"
" n = 10;\n"
" argv32 = 0;\n"
" }\n"
"\n"
" for (int i = 0; i < n; i++) {\n"
" argv32[i] = 0;\n"
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());
TODO_ASSERT_EQUALS("error", errout.str());
}
void nullpointer7() void nullpointer7()
{ {
check("void foo()\n" check("void foo()\n"