Skip to content

Fix #10572 FP nullPointerRedundantCheck with try/catch / #10701 FP knownConditionTrueFalse with nested try/catch #5761

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
orbitcowboy merged 6 commits into from
Dec 13, 2023
Merged

Fix #10572 FP nullPointerRedundantCheck with try/catch / #10701 FP knownConditionTrueFalse with nested try/catch #5761

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d9c2815
Fix #10572 FP nullPointerRedundantCheck with try/catch
chrchr-github Dec 13, 2023
e8da8de
Add test for #10701
chrchr-github Dec 13, 2023
6da2cb2
Add test for #11873
chrchr-github Dec 13, 2023
0fecad2
Format
chrchr-github Dec 13, 2023
4b8212c
TODO
chrchr-github Dec 13, 2023
e4be3f2
Add test for #6145
chrchr-github Dec 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lib/forwardanalyzer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,8 +748,11 @@ namespace {
ForwardTraversal tryTraversal = fork();
tryTraversal.updateRange(tok->next(), endBlock, depth - 1);
bool bail = tryTraversal.actions.isModified();
if (bail)
if (bail) {
actions = tryTraversal.actions;
terminate = tryTraversal.terminate;
return Break();
}

while (Token::simpleMatch(endBlock, "} catch (")) {
Token* endCatch = endBlock->linkAt(2);
Expand Down
13 changes: 13 additions & 0 deletions test/testcondition.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5232,6 +5232,19 @@ class TestCondition : public TestFixture {
" }\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f() {\n" // #10701
" std::string s;\n"
" try {\n"
" try {\n"
" s = g();\n"
" }\n"
" catch (const Err& err) {}\n"
" }\n"
" catch (const std::exception& e) {}\n"
" if (s != \"abc\") {}\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void multiConditionAlwaysTrue() {
Expand Down
51 changes: 51 additions & 0 deletions test/testnullpointer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ class TestNullPointer : public TestFixture {
TEST_CASE(nullpointer100); // #11636
TEST_CASE(nullpointer101); // #11382
TEST_CASE(nullpointer102);
TEST_CASE(nullpointer103);
TEST_CASE(nullpointer_addressOf); // address of
TEST_CASE(nullpointerSwitch); // #2626
TEST_CASE(nullpointer_cast); // #4692
Expand Down Expand Up @@ -2658,6 +2659,26 @@ class TestNullPointer : public TestFixture {
ASSERT_EQUALS(
"[test.cpp:9] -> [test.cpp:8]: (warning) Either the condition 'ptr->y!=nullptr' is redundant or there is possible null pointer dereference: ptr->y.\n",
errout.str());

check("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
" if (first->str() == \")\")\n"
" return true;\n"
" else if (first->next()->str() == \"=\")\n"
" first = first->nextArgument();\n"
" else if (second->next()->str() == \"=\") {\n"
" second = second->nextArgument();\n"
" if (second)\n"
" second = second->tokAt(-2);\n"
" if (!first || !second) {\n"
" return !first && !second;\n"
" }\n"
" }\n"
" return false;\n"
"}\n");
ASSERT_EQUALS(
"[test.cpp:10] -> [test.cpp:2]: (warning) Either the condition '!first' is redundant or there is possible null pointer dereference: first.\n"
"[test.cpp:10] -> [test.cpp:4]: (warning) Either the condition '!first' is redundant or there is possible null pointer dereference: first.\n",
errout.str());
}

void nullpointer90() // #6098
Expand Down Expand Up @@ -2858,6 +2879,36 @@ class TestNullPointer : public TestFixture {
ASSERT_EQUALS("", errout.str());
}

void nullpointer103()
{
check("struct S {\n" // #10572
" int f();\n"
" int* m_P{};\n"
"};\n"
"int S::f() {\n"
" if (!m_P) {\n"
" try {\n"
" m_P = new int(1);\n"
" }\n"
" catch (...) {\n"
" return 0;\n"
" }\n"
" }\n"
" return *m_P;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

check("void f(int* p, const int* q) {\n" // #11873
" if (*q == -1)\n"
" *p = 0;\n"
"}\n"
"void g() {\n"
" int x = -2;\n"
" f(nullptr, &x);\n"
"}\n");
TODO_ASSERT_EQUALS("", "[test.cpp:3]: (warning) Possible null pointer dereference: p\n", errout.str());
}

void nullpointer_addressOf() { // address of
check("void f() {\n"
" struct X *x = 0;\n"
Expand Down
17 changes: 17 additions & 0 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5407,6 +5407,23 @@ class TestUnusedVar : public TestFixture {
" return 0;\n"
"}");
ASSERT_EQUALS("", errout.str());

functionVariableUsage("bool argsMatch(const Token *first, const Token *second) {\n" // #6145
" if (first->str() == \")\")\n"
" return true;\n"
" else if (first->next()->str() == \"=\")\n"
" first = first->nextArgument();\n"
" else if (second->next()->str() == \"=\") {\n"
" second = second->nextArgument();\n"
" if (second)\n"
" second = second->tokAt(-2);\n"
" if (!first || !second) {\n"
" return !first && !second;\n"
" }\n"
" }\n"
" return false;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:5]: (style) Variable 'first' is assigned a value that is never used.\n", errout.str());
}

void localvarIfElse() {
Expand Down