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

Fixed #3645

This commit is contained in:
Nilesh Kumar 2012-09-05 13:48:00 +02:00 committed by PKEuS
parent 9ad7dfd5fd
commit c7633fc73c
3 changed files with 154 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
lib/checkother.cpp
View File

@ -3382,3 +3382,112 @@ void CheckOther::incompleteArrayFillError(const Token* tok, const std::string& b
"Array '" + buffer + "' is filled incompletely. Did you forget to multiply the size given to '" + function + "()' with 'sizeof(*" + buffer + ")'?\n" "Array '" + buffer + "' is filled incompletely. Did you forget to multiply the size given to '" + function + "()' with 'sizeof(*" + buffer + ")'?\n"
"The array '" + buffer + "' is filled incompletely. The function '" + function + "()' needs the size given in bytes, but an element of the given array is larger than one byte. Did you forget to multiply the size with 'sizeof(*" + buffer + ")'?", true); "The array '" + buffer + "' is filled incompletely. The function '" + function + "()' needs the size given in bytes, but an element of the given array is larger than one byte. Did you forget to multiply the size with 'sizeof(*" + buffer + ")'?", true);
} }
void CheckOther::avoidDeadEndInNestedIfs()
{
if (!_settings->isEnabled("style"))
return;
const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();
for (std::list<Scope>::const_iterator scope = symbolDatabase->scopeList.begin(); scope != symbolDatabase->scopeList.end(); ++scope) {
const Token* const toke = scope->classDef;
if (scope->type == Scope::eIf && toke) {
int flag = 0;
const Token *op1Tok, *op2Tok;
op1Tok = scope->classDef->tokAt(2);
op2Tok = scope->classDef->tokAt(4);
if (scope->classDef->strAt(6) == "{") {
if (scope->classDef->strAt(3) == "==") {
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
else if (Token::Match(tok, "%any% ( %any% )")) {
if ((tok->strAt(2) == op1Tok->str() || tok->strAt(2) == op2Tok->str()))
break;
} else if (Token::Match(tok, "%any% ( %any% , %any%")) {
for (const Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
if (tok2->str() == op1Tok->str()) {
flag = 1;
break;
}
}
} else if (Token::Match(tok, "if ( %any% !=|<|>|<=|>= %any% )")) {
if ((tok->strAt(2) == op1Tok->str() && tok->strAt(4) == op2Tok->str()) || (tok->strAt(2) == op2Tok->str() && tok->strAt(4) == op1Tok->str()))
warningDeadCode(toke);
}
}
} else if (scope->classDef->strAt(3) == "!=") {
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
else if (Token::Match(tok, "%any% ( %any% )")) {
if ((tok->strAt(2) == op1Tok->str() || tok->strAt(2) == op2Tok->str()))
break;
} else if (Token::Match(tok, "%any% ( %any% , %any%")) {
for (const Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
if (tok2->str() == op1Tok->str()) {
flag = 1;
break;
}
}
} else if (Token::Match(tok, "if ( %any% ==|>=|<= %any% )")) {
if ((tok->strAt(2) == op1Tok->str() && tok->strAt(4) == op2Tok->str()) || (tok->strAt(2) == op2Tok->str() && tok->strAt(4) == op1Tok->str()))
warningDeadCode(toke);
}
}
} else if (scope->classDef->strAt(3) == "<") {
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
else if (Token::Match(tok, "%any% ( %any% )")) {
if ((tok->strAt(2) == op1Tok->str() || tok->strAt(2) == op2Tok->str()))
break;
} else if (Token::Match(tok, "%any% ( %any% , %any%")) {
for (const Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
if (tok2->str() == op1Tok->str()) {
flag = 1;
break;
}
}
} else if (Token::Match(tok, "if ( %any% <|<=|>|>=|== %any% )")) {
if ((tok->strAt(2) == op1Tok->str() && tok->strAt(4) == op2Tok->str()) || (tok->strAt(2) == op2Tok->str() && tok->strAt(4) == op1Tok->str()))
warningDeadCode(toke);
}
}
} else if (scope->classDef->strAt(3) == "<=") {
for (const Token* tok = scope->classStart; tok != scope->classEnd && flag == 0; tok = tok->next()) {
if ((tok->str() == op1Tok->str() || tok->str() == op2Tok->str()) && tok->strAt(1) == "=")
break;
else if (Token::Match(tok, "%any% ( %any% )")) {
if ((tok->strAt(2) == op1Tok->str() || tok->strAt(2) == op2Tok->str()))
break;
} else if (Token::Match(tok, "%any% ( %any% , %any%")) {
for (const Token* tok2 = tok->next(); tok2 != tok->linkAt(1); tok2 = tok2->next()) {
if (tok2->str() == op1Tok->str()) {
flag = 1;
break;
}
}
} else if (Token::Match(tok, "if ( %any% <|<=|>|>= %any% )")) {
if ((tok->strAt(2) == op1Tok->str() && tok->strAt(4) == op2Tok->str()) || (tok->strAt(2) == op2Tok->str() && tok->strAt(4) == op1Tok->str()))
warningDeadCode(toke);
}
}
}
}
}
}
}
void CheckOther::warningDeadCode(const Token *tok)
{
reportError(tok, Severity::warning, "redundantOperationIn", "There are opposite condition checks in your nested-if block, which leads to a dead code block", true);
}

7
lib/checkother.h
View File

@ -84,6 +84,7 @@ public:
CheckOther checkOther(tokenizer, settings, errorLogger); CheckOther checkOther(tokenizer, settings, errorLogger);
// Checks // Checks
checkOther.avoidDeadEndInNestedIfs();
checkOther.clarifyCalculation(); checkOther.clarifyCalculation();
checkOther.clarifyStatement(); checkOther.clarifyStatement();
checkOther.checkConstantFunctionParameter(); checkOther.checkConstantFunctionParameter();
@ -112,6 +113,9 @@ public:
checkOther.checkNegativeBitwiseShift(); checkOther.checkNegativeBitwiseShift();
} }
/** To check the dead code in a program, which is unaccessible due to the counter-conditions check in nested-if statements **/
void avoidDeadEndInNestedIfs();
/** @brief Clarify calculation for ".. a * b ? .." */ /** @brief Clarify calculation for ".. a * b ? .." */
void clarifyCalculation(); void clarifyCalculation();
@ -267,6 +271,7 @@ public:
private: private:
// Error messages.. // Error messages..
void warningDeadCode(const Token *tok);
void clarifyCalculationError(const Token *tok, const std::string &op); void clarifyCalculationError(const Token *tok, const std::string &op);
void clarifyConditionError(const Token *tok, bool assign, bool boolop); void clarifyConditionError(const Token *tok, bool assign, bool boolop);
void clarifyStatementError(const Token* tok, const std::string &expr, const std::string &suggested); void clarifyStatementError(const Token* tok, const std::string &expr, const std::string &suggested);
@ -351,6 +356,7 @@ private:
c.redundantAssignmentError(0, 0, "var"); c.redundantAssignmentError(0, 0, "var");
// style/warning // style/warning
c.warningDeadCode(0);
c.cstyleCastError(0); c.cstyleCastError(0);
c.dangerousUsageStrtolError(0); c.dangerousUsageStrtolError(0);
c.passedByValueError(0, "parametername"); c.passedByValueError(0, "parametername");
@ -421,6 +427,7 @@ private:
"* subsequent assignment or copying to a variable or buffer\n" "* subsequent assignment or copying to a variable or buffer\n"
// style // style
"* Find dead code which is unaccessible due to the counter-conditions check in nested if statements\n"
"* C-style pointer cast in cpp file\n" "* C-style pointer cast in cpp file\n"
"* casting between incompatible pointer types\n" "* casting between incompatible pointer types\n"
"* redundant if\n" "* redundant if\n"

38
test/testother.cpp
View File

@ -33,6 +33,7 @@ private:
void run() { void run() {
TEST_CASE(avoidDeadEndInNestedIfs);
TEST_CASE(assignBoolToPointer); TEST_CASE(assignBoolToPointer);
TEST_CASE(zeroDiv1); TEST_CASE(zeroDiv1);
@ -252,6 +253,43 @@ private:
} }
void avoidDeadEndInNestedIfs() {
check("void foo(int a, int b)\n"
"{\n"
" if(a==b)\n"
" if(a!=b)\n"
" cout << a;\n"
"}");
ASSERT_EQUALS("[test.cpp:3]: (warning, inconclusive) There are opposite condition checks in your nested-if block, which leads to a dead code block\n", errout.str());
check("void foo(int i) \n"
"{\n"
" if(i > 5) {\n"
" i = bar();\n"
" if(i < 5) {\n"
" cout << a; \n"
" }\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
check("void foo(int& i)\n"
"{\n"
" i=6;\n"
"}\n"
"void bar(int i)\n"
"{\n"
" if(i>5){\n"
" foo(i);\n"
" if(i<5){\n"
" }\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void assignBoolToPointer() { void assignBoolToPointer() {
check("void foo(bool *p) {\n" check("void foo(bool *p) {\n"
" p = false;\n" " p = false;\n"