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

Refactoring oppositeInnerCondition checking

This commit is contained in:
Daniel Marjamäki 2017-09-04 22:54:06 +02:00
parent d82805b7fe
commit d02d235e5e
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/astutils.cpp
View File

@ -256,14 +256,8 @@ bool isOppositeCond(bool isNot, bool cpp, const Token * const cond1, const Token
if (cond2->str() == "!")
return isOppositeCond(isNot, cpp, cond2, cond1, library, pure);
if (!cond1->isComparisonOp() || !cond2->isComparisonOp()) {
if (!isNot && cond1->str() == "&&" && cond2->isComparisonOp()) {
return isOppositeCond(isNot, cpp, cond1->astOperand1(), cond2, library, pure) ||
isOppositeCond(isNot, cpp, cond1->astOperand2(), cond2, library, pure);
}
if (!cond1->isComparisonOp() || !cond2->isComparisonOp())
return false;
}
const std::string &comp1 = cond1->str();

27
lib/checkcondition.cpp
View File

@ -528,9 +528,20 @@ void CheckCondition::multiCondition2()
const Token *cond2 = tok->next()->astOperand2();
if (type == MULTICONDITIONTYPE::INNER) {
if (isOppositeCond(false, _tokenizer->isCPP(), cond1, cond2, _settings->library, true)) {
if (!isAliased(vars))
oppositeInnerConditionError(cond1, cond2);
std::stack<const Token *> tokens1;
tokens1.push(cond1);
while (!tokens1.empty()) {
const Token *firstCondition = tokens1.top();
tokens1.pop();
if (!firstCondition)
continue;
if (firstCondition->str() == "&&") {
tokens1.push(firstCondition->astOperand1());
tokens1.push(firstCondition->astOperand2());
} else if (isOppositeCond(false, _tokenizer->isCPP(), firstCondition, cond2, _settings->library, true)) {
if (!isAliased(vars))
oppositeInnerConditionError(firstCondition, cond2);
}
}
} else {
std::stack<const Token *> tokens2;
@ -609,10 +620,14 @@ void CheckCondition::multiCondition2()
void CheckCondition::oppositeInnerConditionError(const Token *tok1, const Token* tok2)
{
const std::string s1(tok1 ? tok1->expressionString() : "x");
const std::string s2(tok2 ? tok2->expressionString() : "!x");
ErrorPath errorPath;
errorPath.push_back(ErrorPathItem(tok1, "outer condition"));
errorPath.push_back(ErrorPathItem(tok2, "opposite inner condition"));
reportError(errorPath, Severity::warning, "oppositeInnerCondition", "Opposite inner 'if' condition leads to a dead code block.", CWE398, false);
errorPath.push_back(ErrorPathItem(tok1, "outer condition: " + s1));
errorPath.push_back(ErrorPathItem(tok2, "opposite inner condition: " + s2));
const std::string msg("Opposite inner 'if' condition leads to a dead code block.\n"
"Opposite inner 'if' condition leads to a dead code block (outer condition is '" + s1 + "' and inner condition is '" + s2 + "').");
reportError(errorPath, Severity::warning, "oppositeInnerCondition", msg, CWE398, false);
}
void CheckCondition::sameConditionAfterEarlyExitError(const Token *cond1, const Token* cond2)