Skip to content

Fix #12119 FN constVariablePointer with reassigned pointer #5592

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
orbitcowboy merged 5 commits into from
Oct 28, 2023
Merged

Fix #12119 FN constVariablePointer with reassigned pointer #5592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1484802
Fix #12119 FN constVariablePointer with reassigned pointer
chrchr-github Oct 24, 2023
5f6dd43
const
chrchr-github Oct 24, 2023
ad78142
const
chrchr-github Oct 24, 2023
aa6c193
Set originalName for platform types
chrchr-github Oct 24, 2023
d6743f2
Fix test
chrchr-github Oct 24, 2023
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: 3 additions & 2 deletions lib/astutils.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2537,11 +2537,12 @@ bool isVariableChanged(const Token *tok, int indirect, const Settings *settings,
tok2 = skipRedundantPtrOp(tok2, tok2->astParent());

if (tok2->astParent() && tok2->astParent()->isAssignmentOp()) {
if (tok2 == tok2->astParent()->astOperand1())
if ((indirect == 0 || tok2 != tok) && tok2 == tok2->astParent()->astOperand1())
return true;
// Check if assigning to a non-const lvalue
const Variable * var = getLHSVariable(tok2->astParent());
if (var && var->isReference() && !var->isConst() && var->nameToken() && var->nameToken()->next() == tok2->astParent()) {
if (var && var->isReference() && !var->isConst() &&
((var->nameToken() && var->nameToken()->next() == tok2->astParent()) || var->isPointer())) {
if (!var->isLocal() || isVariableChanged(var, settings, cpp, depth - 1))
return true;
}
Expand Down
2 changes: 2 additions & 0 deletions lib/checkother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1705,6 +1705,8 @@ void CheckOther::checkConstPointer()
continue;
if (p->isArgument() && p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
continue;
if (p->typeStartToken() && !p->typeStartToken()->originalName().empty())
continue;
constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
}
}
Expand Down
2 changes: 1 addition & 1 deletion lib/clangimport.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -992,7 +992,7 @@ Token *clangimport::AstNode::createTokens(TokenList *tokenList)

mData->enumValue = 0;
Token *enumtok = addtoken(tokenList, "enum");
Token *nametok = nullptr;
const Token *nametok = nullptr;
{
int nameIndex = mExtTokens.size() - 1;
while (nameIndex > colIndex && mExtTokens[nameIndex][0] == '\'')
Expand Down
2 changes: 1 addition & 1 deletion lib/tokenlist.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1914,6 +1914,7 @@ void TokenList::simplifyPlatformTypes()
tok = tok->previous();
tok->deleteThis();
}
tok->originalName(tok->str());
Token *typeToken;
if (platformtype->mConstPtr) {
tok->str("const");
Expand All @@ -1930,7 +1931,6 @@ void TokenList::simplifyPlatformTypes()
tok->insertToken("*");
tok->insertToken("*");
} else {
tok->originalName(tok->str());
tok->str(platformtype->mType);
typeToken = tok;
}
Expand Down
2 changes: 1 addition & 1 deletion test/cfg/gtk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@ void g_new_if_test()
int b;
};

struct a * pNew3;
const struct a * pNew3;
if (pNew3 = g_new(struct a, 6)) {
printf("%p", pNew3);
}
Expand Down
13 changes: 7 additions & 6 deletions test/testother.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8915,14 +8915,14 @@ class TestOther : public TestFixture {
" state_t *x = NULL;\n"
" x = dostuff();\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());

check("void f() {\n"
" state_t *x;\n"
" x = NULL;\n"
" x = dostuff();\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("test.cpp:2:style:Variable 'x' can be declared as pointer to const\n", errout.str());

check("int foo() {\n" // #4420
" int x;\n"
Expand Down Expand Up @@ -9055,7 +9055,8 @@ class TestOther : public TestFixture {
" barney(x);\n"
" }\n"
"}");
ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n",
ASSERT_EQUALS("test.cpp:2:style:The scope of the variable 'p' can be reduced.\n"
"test.cpp:2:style:Variable 'p' can be declared as pointer to const\n",
errout.str());

check("void foo() {\n"
Expand Down Expand Up @@ -9147,14 +9148,14 @@ class TestOther : public TestFixture {
" a = (void*)0;\n"
" a = p;\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());

check("void f() {\n"
" void* a;\n"
" a = (void*)0U;\n"
" a = p;\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("[test.cpp:2]: (style) Variable 'a' can be declared as pointer to const\n", errout.str());
}

void redundantVarAssignment_struct() {
Expand Down Expand Up @@ -9411,7 +9412,7 @@ class TestOther : public TestFixture {
" int *p = NULL;\n"
" p = dostuff();\n"
"}");
ASSERT_EQUALS("", errout.str());
ASSERT_EQUALS("test.cpp:2:style:Variable 'p' can be declared as pointer to const\n", errout.str());

// "trivial" initialization => do not warn
check("void f() {\n"
Expand Down