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

Fix CTU nullpointer check

This commit is contained in:
Daniel Marjamäki 2018-12-25 12:04:01 +01:00
parent ddbe5c129c
commit a1dca6acd5
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/checkuninitvar.cpp
View File

@ -1398,7 +1398,7 @@ Check::FileInfo *CheckUninitVar::getFileInfo() const
const Token *argtok = args[argnr]; const Token *argtok = args[argnr];
if (!argtok) if (!argtok)
continue; continue;
if (argtok->valueType() && argtok->valueType()->pointer > 0) { {
// null pointer.. // null pointer..
const ValueFlow::Value *value = argtok->getValue(0); const ValueFlow::Value *value = argtok->getValue(0);
if (value && !value->isInconclusive()) if (value && !value->isInconclusive())

10
test/testnullpointer.cpp
View File

@ -2693,6 +2693,8 @@ private:
} }
void ctu() { void ctu() {
setMultiline();
ctu("void f(int *fp) {\n" ctu("void f(int *fp) {\n"
" a = *fp;\n" " a = *fp;\n"
"}\n" "}\n"
@ -2700,14 +2702,18 @@ private:
" int *p = 0;\n" " int *p = 0;\n"
" f(p);\n" " f(p);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:6] -> [test.cpp:2]: (error) Null pointer dereference: fp\n", errout.str()); ASSERT_EQUALS("test.cpp:2:error:Null pointer dereference: fp\n"
"test.cpp:6:note:Calling function f, 1st argument is null\n"
"test.cpp:2:note:Dereferencing argument fp that is null\n", errout.str());
ctu("void use(int *p) { a = *p + 3; }\n" ctu("void use(int *p) { a = *p + 3; }\n"
"void call(int x, int *p) { x++; use(p); }\n" "void call(int x, int *p) { x++; use(p); }\n"
"int main() {\n" "int main() {\n"
" call(4,0);\n" " call(4,0);\n"
"}"); "}");
TODO_ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:1]: (error) Null pointer dereference: p\n", "", errout.str()); ASSERT_EQUALS("test.cpp:1:error:Null pointer dereference: p\n"
"test.cpp:4:note:Calling function call, 2nd argument is null\n"
"test.cpp:1:note:Dereferencing argument p that is null\n", errout.str());
ctu("void dostuff(int *x, int *y) {\n" ctu("void dostuff(int *x, int *y) {\n"
" if (!var)\n" " if (!var)\n"