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

null pointer dereferencing: removed a few false positives in the new check that I added (#485)

This commit is contained in:
Daniel Marjamäki 2009-07-20 19:30:33 +02:00
parent 324f12a103
commit 05a1c50ff2
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/checkother.cpp
View File

@ -1028,8 +1028,12 @@ void CheckOther::nullPointer()
// Dereferencing a pointer and then checking if it's NULL..
for (const Token *tok1 = _tokenizer->tokens(); tok1; tok1 = tok1->next())
{
if (Token::Match(tok1, "%var% . %var%"))
if (Token::Match(tok1, "[{};] %var% = %var% . %var%"))
{
if (std::string(tok1->strAt(1)) == tok1->strAt(3))
continue;
tok1 = tok1->tokAt(3);
const unsigned int varid1(tok1->varId());
if (varid1 == 0)
continue;
@ -1039,12 +1043,14 @@ void CheckOther::nullPointer()
{
if (tok2->str() == "{")
++indentlevel2;
else if (tok2->str() == "}")
{
if (indentlevel2 == 0)
break;
--indentlevel2;
}
else if (tok2->str() == "if")
{
if (Token::Match(tok2, "if ( !| %varid% )", varid1))

22
test/testother.cpp
View File

@ -60,6 +60,7 @@ private:
TEST_CASE(nullpointer2);
TEST_CASE(nullpointer3);
TEST_CASE(nullpointer4);
TEST_CASE(nullpointer5);
TEST_CASE(oldStylePointerCast);
}
@ -468,6 +469,27 @@ private:
ASSERT_EQUALS("[test.cpp:3]: (error) Possible null pointer dereference\n", errout.str());
}
void nullpointer5()
{
// ok dereferencing in a condition
checkNullPointer("void foo(struct ABC *abc)\n"
"{\n"
" if (abc && abc->a);\n"
" if (!abc)\n"
" ;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
// ok to use a linked list..
checkNullPointer("void foo(struct ABC *abc)\n"
"{\n"
" abc = abc->next;\n"
" if (!abc)\n"
" ;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void checkOldStylePointerCast(const char code[])
{
// Tokenize..