Skip to content

Partial fix for #10976 FN autoVariables [inconclusive] (regression) #8170

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

Open
chrchr-github wants to merge 2 commits into
base: main
Choose a base branch
from
+39 −5
Open

Partial fix for #10976 FN autoVariables [inconclusive] (regression) #8170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4c9eae0
Update testautovariables.cpp
chrchr-github Jan 29, 2026
9290b38
Update checkautovariables.cpp
chrchr-github Jan 29, 2026
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
26 changes: 23 additions & 3 deletions lib/checkautovariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,6 +263,23 @@ static bool hasOverloadedAssignment(const Token* tok, bool& inconclusive)
return true;
}

static bool isMemberAssignment(const Token* tok, const Token*& rhs, const Settings& settings)
{
if (!Token::Match(tok, "[;{}] %var% . %var%"))
return false;
if (!isPtrArg(tok->next()))
return false;
const Token* assign = tok->tokAt(2)->astParent();
while (Token::simpleMatch(assign, "["))
assign = assign->astParent();
if (!Token::simpleMatch(assign, "="))
return false;
if (!isAutoVariableRHS(assign->astOperand2(), settings))
return false;
rhs = assign->astOperand2();
return true;
}

void CheckAutoVariables::autoVariables()
{
logChecker("CheckAutoVariables::autoVariables");
Expand All @@ -277,6 +294,7 @@ void CheckAutoVariables::autoVariables()
continue;
}
// Critical assignment
const Token* rhs{};
if (Token::Match(tok, "[;{}] %var% =") && isRefPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(2)->astOperand2(), *mSettings)) {
checkAutoVariableAssignment(tok->next(), false);
} else if (Token::Match(tok, "[;{}] * %var% =") && isPtrArg(tok->tokAt(2)) && isAutoVariableRHS(tok->tokAt(3)->astOperand2(), *mSettings)) {
Expand All @@ -285,12 +303,12 @@ void CheckAutoVariables::autoVariables()
if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
checkAutoVariableAssignment(tok->next(), inconclusive);
tok = tok->tokAt(4);
} else if (Token::Match(tok, "[;{}] %var% . %var% =") && isPtrArg(tok->next()) && isAutoVariableRHS(tok->tokAt(4)->astOperand2(), *mSettings)) {
} else if (isMemberAssignment(tok, rhs, *mSettings)) {
const Token* lhs = tok->tokAt(3);
bool inconclusive = false;
if (!hasOverloadedAssignment(lhs, inconclusive) || (printInconclusive && inconclusive))
checkAutoVariableAssignment(tok->next(), inconclusive);
tok = tok->tokAt(5);
tok = rhs;
} else if (Token::Match(tok, "[;{}] %var% [") && Token::simpleMatch(tok->linkAt(2), "] =") &&
(isPtrArg(tok->next()) || isArrayArg(tok->next(), *mSettings)) &&
isAutoVariableRHS(tok->linkAt(2)->next()->astOperand2(), *mSettings)) {
Expand Down Expand Up @@ -330,8 +348,10 @@ bool CheckAutoVariables::checkAutoVariableAssignment(const Token *expr, bool inc
if (!startToken)
startToken = Token::findsimplematch(expr, "=")->next();
for (const Token *tok = startToken; tok; tok = tok->next()) {
if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction)
if (tok->str() == "}" && tok->scope()->type == ScopeType::eFunction) {
errorAutoVariableAssignment(expr, inconclusive);
return true;
}

if (Token::Match(tok, "return|throw|break|continue")) {
errorAutoVariableAssignment(expr, inconclusive);
Expand Down
18 changes: 16 additions & 2 deletions test/testautovariables.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -711,8 +711,7 @@ class TestAutoVariables : public TestFixture {
" g(&s);\n"
"}");
ASSERT_EQUALS(
"[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
"[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n", // duplicate
"[test.cpp:4:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
errout_str());
}

Expand Down Expand Up @@ -4693,6 +4692,21 @@ class TestAutoVariables : public TestFixture {
"}\n");
ASSERT_EQUALS("", errout_str());

check("struct S {\n"
" int* a[1];\n"
" int* b[1][1];\n"
"};\n"
"void f(S* s) {\n"
" int i = 0;\n"
" s->a[0] = &i;\n"
"}\n"
"void g(S* s) {\n"
" int i = 0;\n"
" s->b[0][0] = &i;\n"
"}\n");
ASSERT_EQUALS("[test.cpp:7:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n"
"[test.cpp:11:5]: (error) Address of local auto-variable assigned to a function parameter. [autoVariables]\n",
errout_str());
}

void deadPointer() {
Expand Down
Loading