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

Uninitialized Member Variables: Check statements that begin after for example "if (..)" or "else" (Bug 2190290)

This commit is contained in:
Daniel Marjamäki 2008-11-01 06:41:45 +00:00
parent 644b3057ed
commit c284e7efad
2 changed files with 59 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
CheckClass.cpp
View File

@ -209,43 +209,53 @@ static void ClassChecking_VarList_Initialize(const TOKEN *ftok, struct VAR *varl
indentlevel--;
}
if (indentlevel>=1 && (Match(ftok, "[{};] %var%") || Match(ftok, "[{};] this . %var%")))
if ( indentlevel < 1 )
continue;
// Before a new statement there is "[{};)]" or "else"
if ( ! Match(ftok, "[{};)]") && ! Match(ftok, "else") )
continue;
if (!Match(ftok->next, "%var%") && !Match(ftok->next, "this . %var%"))
continue;
// Goto the first token in this statement..
ftok = ftok->next;
// Skip "this->"
if ( Match(ftok, "this .") )
ftok = gettok(ftok, 2);
// Clearing all variables..
if (Match(ftok,"memset ( this ,"))
{
ftok = ftok->next;
if ( Match(ftok, "this .") )
ftok = gettok(ftok, 2);
for (struct VAR *var = varlist; var; var = var->next)
var->init = true;
}
// Clearing all variables..
if (Match(ftok,"memset ( this ,"))
// Calling member function?
else if (Match(ftok, "%var% ("))
{
// No recursive calls!
if ( std::find(callstack.begin(),callstack.end(),ftok->str) == callstack.end() )
{
for (struct VAR *var = varlist; var; var = var->next)
var->init = true;
callstack.push_back( ftok->str );
unsigned int i = 0;
const TOKEN *ftok2 = FindClassFunction( tokens, classname, ftok->str, i );
ClassChecking_VarList_Initialize(ftok2, varlist, classname, callstack);
}
}
// Calling member function?
else if (Match(ftok, "%var% ("))
{
// No recursive calls!
if ( std::find(callstack.begin(),callstack.end(),ftok->str) == callstack.end() )
{
callstack.push_back( ftok->str );
unsigned int i = 0;
const TOKEN *ftok2 = FindClassFunction( tokens, classname, ftok->str, i );
ClassChecking_VarList_Initialize(ftok2, varlist, classname, callstack);
}
}
// Assignment of member variable?
else if (Match(ftok, "%var% ="))
{
InitVar( varlist, ftok->str );
}
// Assignment of member variable?
else if (Match(ftok, "%var% ="))
{
InitVar( varlist, ftok->str );
}
// The functions 'clear' and 'Clear' are supposed to initialize variable.
if (Match(ftok,"%var% . clear (") || Match(ftok,"%var% . Clear ("))
{
InitVar( varlist, ftok->str );
}
// The functions 'clear' and 'Clear' are supposed to initialize variable.
if (Match(ftok,"%var% . clear (") || Match(ftok,"%var% . Clear ("))
{
InitVar( varlist, ftok->str );
}
}
}

18
testconstructors.cpp
View File

@ -56,6 +56,7 @@ private:
TEST_CASE( simple4 );
TEST_CASE( initvar_with_this ); // BUG 2190300
TEST_CASE( initvar_if ); // BUG 2190290
}
@ -129,6 +130,23 @@ private:
ASSERT_EQUALS( std::string(""), errout.str() );
}
void initvar_if()
{
check( "class Fred\n"
"{\n"
"public:\n"
" Fred()\n"
" {\n"
" if (true)\n"
" i = 0;\n"
" else\n"
" i = 1;\n"
" }\n"
" int i;\n"
"};\n" );
ASSERT_EQUALS( std::string(""), errout.str() );
}
};
REGISTER_TEST( TestConstructors )