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

Fixed #1323 (segfault with style in CheckClass::operatorEqRetRefThis())

This commit is contained in:
Robert Reif 2010-01-29 16:04:27 +01:00 committed by Daniel Marjamäki
parent 19bb2940cc
commit 94c5d92b2b
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkclass.cpp
View File

@ -878,8 +878,8 @@ void CheckClass::operatorEqRetRefThis()
if (tok1 && tok1->next() && tok1->next()->str() == "{")
{
const Token *last = tok1->next()->link()->tokAt(-2);
for (tok1 = tok1->tokAt(2); tok1 != last; tok1 = tok1->next())
const Token *last = tok1->next()->link();
for (tok1 = tok1->tokAt(2); tok1 && tok1 != last; tok1 = tok1->next())
{
// check for return of reference to this
if (tok1->str() == "return")
@ -930,8 +930,8 @@ void CheckClass::operatorEqRetRefThis()
if (tok1 && tok1->next() && tok1->next()->str() == "{")
{
const Token *last = tok1->next()->link()->tokAt(-2);
for (tok1 = tok1->tokAt(2); tok1 != last; tok1 = tok1->next())
const Token *last = tok1->next()->link();
for (tok1 = tok1->tokAt(2); tok1 && tok1 != last; tok1 = tok1->next())
{
// check for return of reference to this
if (tok1->str() == "return")

16
test/testclass.cpp
View File

@ -68,7 +68,8 @@ private:
TEST_CASE(noConstructor4);
TEST_CASE(operatorEq1);
TEST_CASE(operatorEqRetRefThis);
TEST_CASE(operatorEqRetRefThis1);
TEST_CASE(operatorEqRetRefThis2); // ticket #1323
TEST_CASE(operatorEqToSelf1); // single class
TEST_CASE(operatorEqToSelf2); // nested class
TEST_CASE(operatorEqToSelf3); // multiple inheritance
@ -175,7 +176,7 @@ private:
checkClass.operatorEqRetRefThis();
}
void operatorEqRetRefThis()
void operatorEqRetRefThis1()
{
checkOpertorEqRetRefThis(
"class A\n"
@ -280,6 +281,17 @@ private:
ASSERT_EQUALS("[test.cpp:10]: (style) 'operator=' should return reference to self\n", errout.str());
}
void operatorEqRetRefThis2()
{
// ticket # 1323
checkOpertorEqRetRefThis(
"class szp\n"
"{\n"
" szp &operator =(int *other) {};\n"
"};");
ASSERT_EQUALS("", errout.str());
}
// Check that operator Equal checks for assignment to self
void checkOpertorEqToSelf(const char code[])
{