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

Fix #12018 (False positive: null pointer, multiple arguments) (#5509)

This commit is contained in:
Daniel Marjamäki 2023-10-05 15:08:25 +02:00 committed by GitHub
parent f054feba85
commit a52d2a23a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/valueflow.cpp
View File

@ -7258,7 +7258,8 @@ struct MultiValueFlowAnalyzer : ValueFlowAnalyzer {
} }
bool stopOnCondition(const Token* /*condTok*/) const override { bool stopOnCondition(const Token* /*condTok*/) const override {
return isConditional(); // TODO fix false negatives
return true; // isConditional();
} }
bool updateScope(const Token* endBlock, bool /*modified*/) const override { bool updateScope(const Token* endBlock, bool /*modified*/) const override {

3
test/teststl.cpp
View File

@ -2386,10 +2386,11 @@ private:
"void g(const std::vector<int>& w) {\n" "void g(const std::vector<int>& w) {\n"
" f(-1, w);\n" " f(-1, w);\n"
"}\n"); "}\n");
ASSERT_EQUALS("test.cpp:5:warning:Array index -1 is out of bounds.\n" TODO_ASSERT_EQUALS("test.cpp:5:warning:Array index -1 is out of bounds.\n"
"test.cpp:8:note:Calling function 'f', 1st argument '-1' value is -1\n" "test.cpp:8:note:Calling function 'f', 1st argument '-1' value is -1\n"
"test.cpp:3:note:Assuming condition is false\n" "test.cpp:3:note:Assuming condition is false\n"
"test.cpp:5:note:Negative array index\n", "test.cpp:5:note:Negative array index\n",
"",
errout.str()); errout.str());
settings = oldSettings; settings = oldSettings;

2
test/testuninitvar.cpp
View File

@ -6490,7 +6490,7 @@ private:
" bool copied_all = true;\n" " bool copied_all = true;\n"
" g(&copied_all, 5, 6, &bytesCopied);\n" " g(&copied_all, 5, 6, &bytesCopied);\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:2]: (warning) Uninitialized variable: *buflen\n", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:7] -> [test.cpp:2]: (warning) Uninitialized variable: *buflen\n", "", errout.str());
// # 9953 // # 9953
valueFlowUninit("uint32_t f(uint8_t *mem) {\n" valueFlowUninit("uint32_t f(uint8_t *mem) {\n"

16
test/testvalueflow.cpp
View File

@ -4517,7 +4517,7 @@ private:
"void f(Object *obj) {\n" "void f(Object *obj) {\n"
" if (valid(obj, K0)) {}\n" " if (valid(obj, K0)) {}\n"
"}\n"; "}\n";
ASSERT_EQUALS(true, testValueOfX(code, 7U, 0)); TODO_ASSERT_EQUALS(true, false, testValueOfX(code, 7U, 0));
ASSERT_EQUALS(false, testValueOfXKnown(code, 7U, 0)); ASSERT_EQUALS(false, testValueOfXKnown(code, 7U, 0));
code = "int f(int i) {\n" code = "int f(int i) {\n"
@ -4530,7 +4530,21 @@ private:
"}\n"; "}\n";
ASSERT_EQUALS(true, testValueOfX(code, 3U, 1)); ASSERT_EQUALS(true, testValueOfX(code, 3U, 1));
ASSERT_EQUALS(true, testValueOfX(code, 3U, 0)); ASSERT_EQUALS(true, testValueOfX(code, 3U, 0));
code = "void foo(int* p, int* x) {\n"
" bool b1 = (p != NULL);\n"
" bool b2 = b1 && (x != NULL);\n"
" if (b2) {\n"
" *x = 3;\n"
" }\n"
"}\n"
"\n"
"void bar() {\n"
" foo(NULL, NULL);\n"
"}\n";
ASSERT_EQUALS(false, testValueOfX(code, 5U, 0));
} }
void valueFlowFunctionReturn() { void valueFlowFunctionReturn() {
const char *code; const char *code;