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

uninitvar: Improved condition handling. Fixes one problem when running 'tools/run_more_tests.sh test/testuninitvar.cpp'

This commit is contained in:
Daniel Marjamäki 2015-07-25 17:55:01 +02:00
parent 8ed0180279
commit acc1566f64
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkuninitvar.cpp
View File

@ -278,12 +278,14 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
// checking if a not-zero variable is zero => bail out // checking if a not-zero variable is zero => bail out
unsigned int condVarId = 0, condVarValue = 0; unsigned int condVarId = 0, condVarValue = 0;
if (Token::Match(tok, "if ( %name% )")) { const Token *condVarTok = nullptr;
std::map<unsigned int,int>::const_iterator it = variableValue.find(tok->tokAt(2)->varId()); if (Token::simpleMatch(tok, "if (") &&
Token::isVariableComparison(tok->next()->astOperand2(), "!=", "0", &condVarTok)) {
std::map<unsigned int,int>::const_iterator it = variableValue.find(condVarTok->varId());
if (it != variableValue.end() && it->second == NOT_ZERO) if (it != variableValue.end() && it->second == NOT_ZERO)
return true; // this scope is not fully analysed => return true return true; // this scope is not fully analysed => return true
else { else {
condVarId = tok->tokAt(2)->varId(); condVarId = condVarTok->varId();
condVarValue = NOT_ZERO; condVarValue = NOT_ZERO;
} }
} }