Fix wrong message

danmar · danmar · commit be4ae66e3689 · 2018-08-12T08:01:15.000+02:00
diff --git a/lib/checkstring.cpp b/lib/checkstring.cpp
@@ -322,10 +322,12 @@ void CheckString::incorrectStringCompareError(const Token *tok, const std::strin
 void CheckString::incorrectStringBooleanError(const Token *tok, const std::string& string)
 {
     const bool charLiteral = string[0] == '\'';
+    const std::string literalType = charLiteral ? "char" : "string";
+    const std::string result = (string == "\'\\0\'") ? "false" : "true";
     reportError(tok,
                 Severity::warning,
                 charLiteral ? "incorrectCharBooleanError" : "incorrectStringBooleanError",
-                "Conversion of " + std::string(charLiteral ? "char" : "string") + " literal " + string + " to bool always evaluates to true.", CWE571, false);
+                "Conversion of " + literalType + " literal " + string + " to bool always evaluates to " + result + '.', CWE571, false);
 }
 
 //---------------------------------------------------------------------------
diff --git a/test/teststring.cpp b/test/teststring.cpp
@@ -596,6 +596,11 @@ class TestString : public TestFixture {
               "  if('\\0'){}\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        check("void f() {\n"
+              "  if('\\0' || cond){}\n"
+              "}");
+        ASSERT_EQUALS("[test.cpp:2]: (warning) Conversion of char literal '\\0' to bool always evaluates to false.\n", errout.str());
     }
 
     void deadStrcmp() {

Original file line number	Diff line number	Diff line change
`@@ -322,10 +322,12 @@ void CheckString::incorrectStringCompareError(const Token *tok, const std::strin`
`322`	`322`	`void CheckString::incorrectStringBooleanError(const Token *tok, const std::string& string)`
`323`	`323`	`{`
`324`	`324`	`const bool charLiteral = string[0] == '\'';`
	`325`	`+ const std::string literalType = charLiteral ? "char" : "string";`
	`326`	`+ const std::string result = (string == "\'\\0\'") ? "false" : "true";`
`325`	`327`	`reportError(tok,`
`326`	`328`	`Severity::warning,`
`327`	`329`	`charLiteral ? "incorrectCharBooleanError" : "incorrectStringBooleanError",`
`328`		`- "Conversion of " + std::string(charLiteral ? "char" : "string") + " literal " + string + " to bool always evaluates to true.", CWE571, false);`
	`330`	`+ "Conversion of " + literalType + " literal " + string + " to bool always evaluates to " + result + '.', CWE571, false);`
`329`	`331`	`}`
`330`	`332`
`331`	`333`	`//---------------------------------------------------------------------------`