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

Fixed #1224 (segmentation fault of cppcheck)

This commit is contained in:
Robert Reif 2010-01-05 21:55:33 +01:00 committed by Daniel Marjamäki
parent a753c41ced
commit e6cc897e29
2 changed files with 42 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
lib/checkclass.cpp
View File

@ -922,7 +922,14 @@ void CheckClass::operatorEqRetRefThis()
static bool hasDeallocation(const Token * first, const Token * last)
{
for (const Token * tok = first; tok && tok != last; tok = tok->next())
// This function is called when no simple check was found for assignment
// to self. We are currently looking for a specific sequence of:
// deallocate member ; ... member = allocate
// This check is far from ideal because it can cause false negatives.
// Unfortunately, this is necessary to prevent false positives.
// This check needs to do careful analysis someday to get this
// correct with a high degree of certainty.
for (const Token * tok = first; tok && (tok != last); tok = tok->next())
{
// check for deallocating memory
if (Token::Match(tok, "{|;|, free ( %type%"))
@ -931,17 +938,17 @@ static bool hasDeallocation(const Token * first, const Token * last)
// we should probably check that var is a pointer in this class
tok = tok->tokAt(4);
const Token * tok1 = tok->tokAt(4);
while (tok && tok != last)
while (tok1 && (tok1 != last))
{
if (Token::Match(tok, "%type% ="))
if (Token::Match(tok1, "%type% ="))
{
if (tok->str() == var->str())
if (tok1->str() == var->str())
return true;
}
tok = tok->next();
tok1 = tok1->next();
}
}
else if (Token::Match(tok, "{|;|, delete [ ] %type%"))
@ -950,17 +957,17 @@ static bool hasDeallocation(const Token * first, const Token * last)
// we should probably check that var is a pointer in this class
tok = tok->tokAt(5);
const Token * tok1 = tok->tokAt(5);
while (tok && tok != last)
while (tok1 && (tok1 != last))
{
if (Token::Match(tok, "%type% = new ["))
if (Token::Match(tok1, "%type% = new ["))
{
if (tok->str() == var->str())
if (tok1->str() == var->str())
return true;
}
tok = tok->next();
tok1 = tok1->next();
}
}
else if (Token::Match(tok, "{|;|, delete %type%"))
@ -969,17 +976,17 @@ static bool hasDeallocation(const Token * first, const Token * last)
// we should probably check that var is a pointer in this class
tok = tok->tokAt(3);
const Token * tok1 = tok->tokAt(3);
while (tok && tok != last)
while (tok1 && (tok1 != last))
{
if (Token::Match(tok, "%type% = new"))
if (Token::Match(tok1, "%type% = new"))
{
if (tok->str() == var->str())
if (tok1->str() == var->str())
return true;
}
tok = tok->next();
tok1 = tok1->next();
}
}
}

20
test/testclass.cpp
View File

@ -145,7 +145,6 @@ private:
" void operator=(const A&);\n"
"};\n");
ASSERT_EQUALS("[test.cpp:3]: (style) 'operator=' should return something\n", errout.str());
}
// Check that operator Equal returns reference to this
@ -399,6 +398,25 @@ private:
" return *this;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:7]: (possible style) 'operator=' should check for assignment to self\n", errout.str());
// ticket #1224
checkOpertorEqToSelf(
"const SubTree &SubTree::operator= (const SubTree &b)\n"
"{\n"
" CodeTree *oldtree = tree;\n"
" tree = new CodeTree(*b.tree);\n"
" delete oldtree;\n"
" return *this;\n"
"}\n"
"const SubTree &SubTree::operator= (const CodeTree &b)\n"
"{\n"
" CodeTree *oldtree = tree;\n"
" tree = new CodeTree(b);\n"
" delete oldtree;\n"
" return *this;\n"
"}");
ASSERT_EQUALS("", errout.str());
}
void operatorEqToSelf2()