Fix #13067 FP incorrectStringBooleanError for macro argument (cppcheck-opensource#6770)

chrchr-github · web-flow · commit fc2f5514030a · 2024-09-07T11:55:03.000+02:00
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
@@ -254,7 +254,7 @@ void CheckString::strPlusCharError(const Token *tok)
 static bool isMacroUsage(const Token* tok)
 {
     if (const Token* parent = tok->astParent()) {
-        while (parent && parent->isCast())
+        while (parent && (parent->isCast() || parent->str() == "&&"))
             parent = parent->astParent();
         if (!parent)
             return false;
diff --git a/test/teststring.cpp b/test/teststring.cpp
@@ -802,6 +802,12 @@ class TestString : public TestFixture {
               "    }\n"
               "};\n");
         ASSERT_EQUALS("[test.cpp:4]: (warning) Conversion of string literal \"test.C\" to bool always evaluates to true.\n", errout_str());
+
+        check("#define MACRO(C) if(!(C)) { error(__FILE__, __LINE__, __FUNCTION__, #C); return; }\n" // #13067
+              "void f() {\n"
+              "    MACRO(false && \"abc\");\n"
+              "}\n");
+        ASSERT_EQUALS("", errout_str());
     }
 
     void deadStrcmp() {

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ void CheckString::strPlusCharError(const Token *tok)`
`254`	`254`	`static bool isMacroUsage(const Token* tok)`
`255`	`255`	`{`
`256`	`256`	`if (const Token* parent = tok->astParent()) {`
`257`		`- while (parent && parent->isCast())`
	`257`	`+ while (parent && (parent->isCast() \|\| parent->str() == "&&"))`
`258`	`258`	`parent = parent->astParent();`
`259`	`259`	`if (!parent)`
`260`	`260`	`return false;`