Skip to content

Fix #12142 FP uninitStructMember, unreadVariable with pointer to member #5618

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danmar merged 1 commit into from
Nov 4, 2023
Merged

Fix #12142 FP uninitStructMember, unreadVariable with pointer to member #5618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions lib/checkuninitvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,6 +697,11 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
return true;
}

// bailout if there is a pointer to member
if (Token::Match(tok, "%varid% . *", var.declarationId())) {
return true;
}

if (tok->str() == "?") {
if (!tok->astOperand2())
return true;
Expand Down
2 changes: 2 additions & 0 deletions lib/fwdanalysis.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,8 @@ bool FwdAnalysis::possiblyAliased(const Token *expr, const Token *startToken) co
{
if (expr->isUnaryOp("*") && !expr->astOperand1()->isUnaryOp("&"))
return true;
if (Token::simpleMatch(expr, ". *"))
return true;

const bool macro = false;
const bool pure = false;
Expand Down
9 changes: 9 additions & 0 deletions test/testuninitvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4875,6 +4875,15 @@ class TestUninitVar : public TestFixture {
" return s;\n"
"}");
ASSERT_EQUALS("", errout.str());

checkUninitVar("struct S { int i; };\n" // #12142
"int f() {\n"
" S s;\n"
" int S::* p = &S::i;\n"
" s.*p = 123;\n"
" return s.i;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void uninitvar2_while() {
Expand Down
12 changes: 12 additions & 0 deletions test/testunusedvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ class TestUnusedVar : public TestFixture {
TEST_CASE(localvarStruct11); // 10095
TEST_CASE(localvarStruct12); // #10495
TEST_CASE(localvarStruct13); // #10398
TEST_CASE(localvarStruct14);
TEST_CASE(localvarStructArray);
TEST_CASE(localvarUnion1);

Expand Down Expand Up @@ -5330,6 +5331,17 @@ class TestUnusedVar : public TestFixture {
ASSERT_EQUALS("", errout.str());
}

void localvarStruct14() { // #12142
functionVariableUsage("struct S { int i; };\n"
"int f() {\n"
" S s;\n"
" int S::* p = &S::i;\n"
" s.*p = 123;\n"
" return s.i;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}

void localvarStructArray() {
// extracttests.start: struct X {int a;};

Expand Down