Fix #13067 FP incorrectStringBooleanError for macro argument (#6770)

danmar · Sep 7, 2024 · fc2f551 · fc2f551
1 parent c2f4c5c
commit fc2f551
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
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() {