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

Null pointers: Fixed false negative for such code 'if (p && *p==0) {} *p = 0;'. Ticket: #2379

This commit is contained in:
Daniel Marjamäki 2011-02-19 21:28:18 +01:00
parent 29d05cf5f2
commit 5f0206725b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checknullpointer.cpp
View File

@ -574,13 +574,13 @@ void CheckNullPointer::nullPointerByCheckAndDeRef()
// vartok : token for the variable // vartok : token for the variable
const Token *vartok = 0; const Token *vartok = 0;
if (Token::Match(tok, "if ( ! %var% ) {")) if (Token::Match(tok, "if ( ! %var% )|&&"))
vartok = tok->tokAt(3); vartok = tok->tokAt(3);
else if (Token::Match(tok, "if ( NULL|0 == %var% ) {")) else if (Token::Match(tok, "if ( NULL|0 == %var% )|&&"))
vartok = tok->tokAt(4); vartok = tok->tokAt(4);
else if (Token::Match(tok, "if ( %var% == NULL|0 ) {")) else if (Token::Match(tok, "if ( %var% == NULL|0 )|&&"))
vartok = tok->tokAt(2); vartok = tok->tokAt(2);
else if (Token::Match(tok, "if|while ( %var% ) {") && else if (Token::Match(tok, "if|while ( %var% )|&&") &&
!Token::simpleMatch(tok->tokAt(4)->link(), "} else")) !Token::simpleMatch(tok->tokAt(4)->link(), "} else"))
vartok = tok->tokAt(2); vartok = tok->tokAt(2);
else else

7
test/testnullpointer.cpp
View File

@ -823,6 +823,13 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("[test.cpp:4]: (error) Possible null pointer dereference: p\n", errout.str()); ASSERT_EQUALS("[test.cpp:4]: (error) Possible null pointer dereference: p\n", errout.str());
check("void foo(char *p) {\n"
" if (p && *p == 0) {\n"
" }\n"
" printf(\"%c\", *p);\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4]: (error) Possible null pointer dereference: p\n", errout.str());
check("void foo(abc *p) {\n" check("void foo(abc *p) {\n"
" if (!p) {\n" " if (!p) {\n"
" }\n" " }\n"