walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Merge branch 'master' of git@github.com:danmar/cppcheck

This commit is contained in:
Kimmo Varis 2009-06-20 20:56:13 +03:00
parent 210014b930 8a3ec4549b
commit b40a5916c4
2 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/checkother.cpp
View File

@ -752,10 +752,26 @@ void CheckOther::CheckCharVariable()
break;
}
std::string tempFirst = "%var% [&|] " + tok->str();
std::string tempSecond = tok->str() + " [&|]";
if (Token::Match(tok2, tempFirst.c_str()) || Token::Match(tok2, tempSecond.c_str()))
if (Token::Match(tok2, "[;{}] %var% = %any% [&|] %any% ;"))
{
// is the char variable used in the calculation?
if (tok2->tokAt(3)->varId() != tok->varId() && tok2->tokAt(5)->varId() != tok->varId())
continue;
// it's ok with a bitwise and where the other operand is 0xff or less..
if (std::string(tok2->strAt(4)) == "&")
{
if (tok2->tokAt(3)->isNumber() && MathLib::isGreater("0x100", tok2->strAt(3)))
continue;
if (tok2->tokAt(5)->isNumber() && MathLib::isGreater("0x100", tok2->strAt(5)))
continue;
}
// is the result stored in a short|int|long?
if (!Token::findmatch(_tokenizer->tokens(), "short|int|long %varid%", tok2->next()->varId()))
continue;
// This is an error..
charBitOpError(tok2);
break;
}

25
test/testcharvar.cpp
View File

@ -39,6 +39,8 @@ private:
TEST_CASE(bitop1);
TEST_CASE(bitop2);
TEST_CASE(return1);
TEST_CASE(assignChar);
TEST_CASE(and03);
}
void check(const char code[])
@ -93,6 +95,7 @@ private:
{
check("void foo()\n"
"{\n"
" int result = 0;\n"
" char ch;\n"
" result = a | ch;\n"
"}\n");
@ -118,6 +121,28 @@ private:
"}\n");
ASSERT_EQUALS("", errout.str());
}
void assignChar()
{
check("void foo()\n"
"{\n"
" char c;\n"
" c = c & 0x123;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void and03()
{
check("void foo()\n"
"{\n"
" char c;\n"
" int i = c & 0x03;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
};
REGISTER_TEST(TestCharVar)