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

Uninitialized variables: Fixed false positives when variable x is given a nonzero value when variable y is uninitialized.

This commit is contained in:
Daniel Marjamäki 2012-12-23 16:27:04 +01:00
parent abfca0b574
commit 0b4da3d5cd
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/checkuninitvar.cpp
View File

@ -1148,6 +1148,14 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
bool noreturnIf = false; bool noreturnIf = false;
const bool initif = checkScopeForVariable(scope, tok->next(), var, &possibleInitIf, &noreturnIf); const bool initif = checkScopeForVariable(scope, tok->next(), var, &possibleInitIf, &noreturnIf);
std::set<unsigned int> notzeroIf;
if (!initif) {
for (const Token *tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
if (Token::Match(tok2, "[;{}] %var% = - %var% ;"))
notzeroIf.insert(tok2->next()->varId());
}
}
// goto the } // goto the }
tok = tok->link(); tok = tok->link();
@ -1165,6 +1173,14 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
bool noreturnElse = false; bool noreturnElse = false;
const bool initelse = checkScopeForVariable(scope, tok->next(), var, &possibleInitElse, NULL); const bool initelse = checkScopeForVariable(scope, tok->next(), var, &possibleInitElse, NULL);
std::set<unsigned int> notzeroElse;
if (!initelse) {
for (const Token *tok2 = tok; tok2 && tok2 != tok->link(); tok2 = tok2->next()) {
if (Token::Match(tok2, "[;{}] %var% = - %var% ;"))
notzeroElse.insert(tok2->next()->varId());
}
}
// goto the } // goto the }
tok = tok->link(); tok = tok->link();
@ -1174,8 +1190,11 @@ bool CheckUninitVar::checkScopeForVariable(const Scope* scope, const Token *tok,
if ((initif && noreturnElse) || (initelse && noreturnIf)) if ((initif && noreturnElse) || (initelse && noreturnIf))
return true; return true;
if (initif || initelse || possibleInitElse) if (initif || initelse || possibleInitElse) {
++number_of_if; ++number_of_if;
notzero.insert(notzeroIf.begin(), notzeroIf.end());
notzero.insert(notzeroElse.begin(), notzeroElse.end());
}
} }
} }
} }

9
test/testuninitvar.cpp
View File

@ -2153,6 +2153,15 @@ private:
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
checkUninitVar2("void f() {\n"
" int i, y;\n"
" if (x) y = -ENOMEM;\n"
" else y = get_value(i);\n"
" if (y != 0) return;\n" // <- condition is always true if i is uninitialized
" i++;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
// for, while // for, while
checkUninitVar2("void f() {\n" checkUninitVar2("void f() {\n"
" int x;\n" " int x;\n"