Fix #12858 FP knownConditionTrueFalse with switch in try/catch in sub…

…function
danmar · Jun 27, 2024 · 75b609e · 75b609e
1 parent bd536d3
commit 75b609e
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/lib/forwardanalyzer.cpp b/lib/forwardanalyzer.cpp
@@ -811,7 +811,7 @@ namespace {
                 } else if (Token::simpleMatch(tok, "switch (")) {
                     if (updateRecursive(tok->next()->astOperand2()) == Progress::Break)
                         return Break();
-                    return Break();
+                    return updateScope(tok->next()->link()->next()->link());
                 } else if (Token* callTok = callExpr(tok)) {
                     // TODO: Dont traverse tokens a second time
                     if (start != callTok && tok != callTok && updateRecursive(callTok->astOperand1()) == Progress::Break)

diff --git a/test/testcondition.cpp b/test/testcondition.cpp
@@ -4631,6 +4631,26 @@ class TestCondition : public TestFixture {
               "        return;\n"
               "}\n");
         ASSERT_EQUALS("", errout_str());
+
+        check("int h();\n"
+              "bool g() {\n"
+              "    bool b{};\n"
+              "    try {\n"
+              "        int x = h();\n"
+              "        switch (x) {\n"
+              "        default:\n"
+              "            b = true;\n"
+              "        }\n"
+              "    }\n"
+              "    catch (...) {\n"
+              "        b = false;\n"
+              "    }\n"
+              "    return b;\n"
+              "}\n"
+              "void f() {\n"
+              "    if (g()) {}\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void alwaysTrueSymbolic()

diff --git a/test/testnullpointer.cpp b/test/testnullpointer.cpp
@@ -3154,7 +3154,8 @@ class TestNullPointer : public TestFixture {
               "            break;\n"
               "    };\n"
               "}");
-        ASSERT_EQUALS("", errout_str());
+        ASSERT_EQUALS("[test.cpp:2] -> [test.cpp:7]: (warning) Either the condition 'fred==NULL' is redundant or there is possible null pointer dereference: fred.\n",
+                      errout_str());
 
         // #4118 - second if
         check("void f(char *p) {\n"

diff --git a/test/testvalueflow.cpp b/test/testvalueflow.cpp
@@ -2546,7 +2546,7 @@ class TestValueFlow : public TestFixture {
                "    case A: v = x; break;\n" // <- x is not 34
                "  }\n"
                "}";
-        ASSERT_EQUALS(false, testValueOfX(code, 8U, 34));
+        TODO_ASSERT_EQUALS(false, true, testValueOfX(code, 8U, 34));
 
         // while/for
         code = "void f() {\n" // #6138