From a1dca6acd58e7e874ddbf3bf172d92262d79301d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Marjam=C3=A4ki?= <daniel.marjamaki@gmail.com>
Date: Tue, 25 Dec 2018 12:04:01 +0100
Subject: [PATCH] Fix CTU nullpointer check
---
lib/checkuninitvar.cpp | 2 +-
test/testnullpointer.cpp | 10 ++++++++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/lib/checkuninitvar.cpp b/lib/checkuninitvar.cpp
index 3a783b672..cdf8c5a95 100644
--- a/lib/checkuninitvar.cpp
+++ b/lib/checkuninitvar.cpp
@@ -1398,7 +1398,7 @@ Check::FileInfo *CheckUninitVar::getFileInfo() const
const Token *argtok = args[argnr];
if (!argtok)
continue;
- if (argtok->valueType() && argtok->valueType()->pointer > 0) {
+ {
// null pointer..
const ValueFlow::Value *value = argtok->getValue(0);
if (value && !value->isInconclusive())
diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
index f5166129b..9707f7215 100644
--- a/test/testnullpointer.cpp
+++ b/test/testnullpointer.cpp
@@ -2693,6 +2693,8 @@ private:
}
void ctu() {
+ setMultiline();
+
ctu("void f(int *fp) {\n"
" a = *fp;\n"
"}\n"
@@ -2700,14 +2702,18 @@ private:
" int *p = 0;\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"
"void call(int x, int *p) { x++; use(p); }\n"
"int main() {\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"
" if (!var)\n"