Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions lib/checkautovariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -265,11 +265,17 @@ static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)

static bool isMemberAssignment(const Token* tok, const Token*& rhs, const Settings& settings)
{
if (!Token::Match(tok, "[;{}] %var% . %var%"))
return false;
const Token *endBracket = nullptr;
if (!Token::Match(tok, "[;{}] %var% . %var%")) {
if (!Token::Match(tok, "[;{}] %var% ["))
return false;
endBracket = tok->linkAt(2);
if (!Token::Match(endBracket, "] . %var%"))
return false;
}
if (!isPtrArg(tok->next()))
return false;
const Token* assign = tok->tokAt(2)->astParent();
const Token* assign = (endBracket ? endBracket->next() : tok->tokAt(2))->astParent();
while (Token::simpleMatch(assign, "["))
assign = assign->astParent();
if (!Token::simpleMatch(assign, "="))
Expand Down
10 changes: 10 additions & 0 deletions test/testautovariables.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ class TestAutoVariables : public TestFixture {
TEST_CASE(testautovar15); // ticket #6538
TEST_CASE(testautovar16); // ticket #8114
TEST_CASE(testautovar17);
TEST_CASE(testautovar18);
TEST_CASE(testautovar_array1);
TEST_CASE(testautovar_array2);
TEST_CASE(testautovar_array3);
Expand Down Expand Up @@ -516,6 +517,15 @@ class TestAutoVariables : public TestFixture {
ASSERT_EQUALS("", errout_str());
}

void testautovar18() {
check("struct S { int* p; };\n"
"void foo(struct S* s) {\n"
" int x;\n"
" s[2].p = &x;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", errout_str());
}

void testautovar_array1() {
check("void func1(int* arr[2])\n"
"{\n"
Expand Down
Loading