Fixed danmar#3872 ('char variables in bit operations' warning)

danmar · danmar · commit 69846b2a06fc · 2012-06-08T17:24:54.000+02:00
diff --git a/lib/checkother.cpp b/lib/checkother.cpp
@@ -1794,7 +1794,7 @@ void CheckOther::checkCharVariable()
 
         else if (Token::Match(tok, "[;{}] %var% = %any% [&^|] ( * %var% ) ;")) {
             const Variable* var = symbolDatabase->getVariableFromVarId(tok->tokAt(7)->varId());
-            if (!var || !var->isPointer())
+            if (!var || !var->isPointer() || !Token::Match(var->typeStartToken(), "static| const| char"))
                 continue;
             // it's ok with a bitwise and where the other operand is 0xff or less..
             if (tok->strAt(4) == "&" && tok->tokAt(3)->isNumber() && MathLib::isGreater("0x100", tok->strAt(3)))
diff --git a/test/testcharvar.cpp b/test/testcharvar.cpp
@@ -204,6 +204,14 @@ class TestCharVar : public TestFixture {
               "    return ret;\n"
               "}");
         ASSERT_EQUALS("", errout.str());
+
+        // #3872 - false positive
+        check("int f(int *p) {\n"
+              "    int ret = a();\n"
+              "    ret |= *p;\n"
+              "    return ret;\n"
+              "}");
+        ASSERT_EQUALS("", errout.str());
     }
 };
 
