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

Fixed #875 (Uninitialized variable: initialization in subfunction)

This commit is contained in:
Daniel Marjamäki 2009-10-30 18:28:01 +01:00
parent 6ac2b6ab14
commit 45df223bfb
2 changed files with 24 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/checkother.cpp
View File

@ -1211,6 +1211,21 @@ static const Token *uninitvar_checkscope(const Token *tok, const unsigned int va
// goto ")"
tok = tok ? tok->link() : 0;
// Check if the condition contains the variable
if (tok)
{
for (const Token *tok2 = tok->link(); tok2 && tok2 != tok; tok2 = tok2->next())
{
// The variable may be initialized..
// if (someFunction(&var)) ..
if (tok2->varId())
{
init = true;
return 0;
}
}
}
// goto "{"
tok = tok ? tok->next() : 0;
@ -1333,7 +1348,7 @@ void CheckOther::uninitvar()
{
if (Token::Match(tok->next(), "return|goto"))
continue;
// if it's a pointer, dereferencing is forbidden
const bool pointer(tok->strAt(2) == std::string("*"));

9
test/testother.cpp
View File

@ -988,6 +988,14 @@ private:
"}\n");
ASSERT_EQUALS("", errout.str());
checkUninitVar("void f()\n"
"{\n"
" C *c;\n"
" if (fun(&c));\n"
" c->Release();\n"
"}\n");
ASSERT_EQUALS("", errout.str());
// switch..
checkUninitVar("char * f()\n"
"{\n"
@ -1022,7 +1030,6 @@ private:
" return i;\n"
"};\n");
ASSERT_EQUALS("", errout.str());
}