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

reduce false negatives for checking for CheckOther::checkSignOfUnsignedVariable()

This commit is contained in:
Robert Reif 2011-09-26 21:24:34 -04:00
parent bfd3cc102d
commit 2d717d77cd
2 changed files with 156 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/checkother.cpp
View File

@ -2526,24 +2526,30 @@ void CheckOther::checkSignOfUnsignedVariable()
// check all the code in the function
for (const Token *tok = scope->classStart; tok && tok != scope->classStart->link(); tok = tok->next())
{
if (Token::Match(tok, "( %var% <|<= 0 )") && tok->next()->varId())
if (Token::Match(tok, "(|&&|%oror% %var% <|<= 0 )|&&|%oror%") && tok->next()->varId())
{
const Variable * var = symbolDatabase->getVariableFromVarId(tok->next()->varId());
if (var && var->typeEndToken()->isUnsigned())
unsignedLessThanZeroError(tok->next(), tok->next()->str());
}
else if (Token::Match(tok, "( 0 > %var% )") && tok->tokAt(3)->varId())
else if (Token::Match(tok, "(|&&|%oror% 0 > %var% )|&&|%oror%") && tok->tokAt(3)->varId())
{
const Variable * var = symbolDatabase->getVariableFromVarId(tok->tokAt(3)->varId());
if (var && var->typeEndToken()->isUnsigned())
unsignedLessThanZeroError(tok->tokAt(3), tok->strAt(3));
}
else if (Token::Match(tok, "( 0 <= %var% )") && tok->tokAt(3)->varId())
else if (Token::Match(tok, "(|&&|%oror% 0 <= %var% )|&&|%oror%") && tok->tokAt(3)->varId())
{
const Variable * var = symbolDatabase->getVariableFromVarId(tok->tokAt(3)->varId());
if (var && var->typeEndToken()->isUnsigned())
unsignedPositiveError(tok->tokAt(3), tok->strAt(3));
}
else if (Token::Match(tok, "(|&&|%oror% %var% >= 0 )|&&|%oror%") && tok->next()->varId())
{
const Variable * var = symbolDatabase->getVariableFromVarId(tok->next()->varId());
if (var && var->typeEndToken()->isUnsigned())
unsignedPositiveError(tok->next(), tok->next()->str());
}
}
}
}

147
test/testother.cpp
View File

@ -3241,6 +3241,153 @@ private:
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (x < 0 && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (x < 0 && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (0 > x && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (0 > x && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (x >= 0 && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is positive is always true.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (x >= 0 && y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (y && x < 0)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (y && x < 0)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (y && 0 > x)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (y && 0 > x)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (y && x >= 0)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is positive is always true.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (y && x >= 0)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (x < 0 || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (x < 0 || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (0 > x || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is less than zero.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (0 > x || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
check_signOfUnsignedVariable(
"bool foo(unsigned int x, bool y) {\n"
" if (x >= 0 || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("[test.cpp:2]: (style) Checking if unsigned variable 'x' is positive is always true.\n", errout.str());
check_signOfUnsignedVariable(
"bool foo(int x, bool y) {\n"
" if (x >= 0 || y)"
" return true;\n"
" return false;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
};