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

Clarify warning

This commit is contained in:
Daniel Marjamäki 2018-12-23 12:42:18 +01:00
parent e6e3987935
commit b79619832e
2 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/checktype.cpp
View File

@ -243,14 +243,17 @@ void CheckType::checkSignConversion()
void CheckType::signConversionError(const Token *tok, const bool constvalue) void CheckType::signConversionError(const Token *tok, const bool constvalue)
{ {
const std::string varname(tok ? tok->str() : "var"); const std::string expr(tok ? tok->expressionString() : "var");
reportError(tok, std::ostringstream msg;
Severity::warning, if (tok && tok->isName())
"signConversion", msg << "$symbol:" << expr << "\n";
(constvalue) ? if (constvalue)
"$symbol:" + varname + "\nSuspicious code: sign conversion of $symbol in calculation because '$symbol' has a negative value" : msg << "Suspicious code: sign conversion of '" << expr << "' in calculation because '" << expr << "' has a negative value";
"$symbol:" + varname + "\nSuspicious code: sign conversion of $symbol in calculation, even though $symbol can have a negative value", CWE195, false); else
msg << "Suspicious code: sign conversion of '" << expr << "' in calculation, even though '" << expr << "' can have a negative value";
reportError(tok, Severity::warning, "signConversion", msg.str(), CWE195, false);
} }

14
test/testtype.cpp
View File

@ -188,19 +188,25 @@ private:
void signConversion() { void signConversion() {
check("x = -4 * (unsigned)y;"); check("x = -4 * (unsigned)y;");
ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of -4 in calculation because '-4' has a negative value\n", errout.str()); ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of '-4' in calculation because '-4' has a negative value\n", errout.str());
check("unsigned int dostuff(int x) {\n" // x is signed
" if (x==0) {}\n"
" return (x-1)*sizeof(int);\n"
"}\n");
ASSERT_EQUALS("[test.cpp:3]: (warning) Suspicious code: sign conversion of 'x-1' in calculation, even though 'x-1' can have a negative value\n", errout.str());
check("unsigned int f1(signed int x, unsigned int y) {" // x is signed check("unsigned int f1(signed int x, unsigned int y) {" // x is signed
" return x * y;\n" " return x * y;\n"
"}\n" "}\n"
"void f2() { f1(-4,4); }"); "void f2() { f1(-4,4); }");
TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of x in calculation, even though x can have a negative value\n", "", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of 'x' in calculation, even though x can have a negative value\n", "", errout.str());
check("unsigned int f1(int x) {" // x has no signedness, but it can have the value -1 so assume it's signed check("unsigned int f1(int x) {" // x has no signedness, but it can have the value -1 so assume it's signed
" return x * 5U;\n" " return x * 5U;\n"
"}\n" "}\n"
"void f2() { f1(-4); }"); "void f2() { f1(-4); }");
TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of x in calculation, even though x can have a negative value\n", "", errout.str()); TODO_ASSERT_EQUALS("[test.cpp:1]: (warning) Suspicious code: sign conversion of 'x' in calculation, even though x can have a negative value\n", "", errout.str());
check("unsigned int f1(int x) {" // #6168: FP for inner calculation check("unsigned int f1(int x) {" // #6168: FP for inner calculation
" return 5U * (1234 - x);\n" // <- signed subtraction, x is not sign converted " return 5U * (1234 - x);\n" // <- signed subtraction, x is not sign converted
@ -218,7 +224,7 @@ private:
check("size_t foo(size_t x) {\n" check("size_t foo(size_t x) {\n"
" return -2 * x;\n" " return -2 * x;\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious code: sign conversion of -2 in calculation because '-2' has a negative value\n", errout.str()); ASSERT_EQUALS("[test.cpp:2]: (warning) Suspicious code: sign conversion of '-2' in calculation because '-2' has a negative value\n", errout.str());
} }
void longCastAssign() { void longCastAssign() {