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

Fix #12129 FN (regression): constParameterPointer (#5605)

This commit is contained in:
chrchr-github 2023-11-01 09:49:19 +01:00 committed by GitHub
parent 67b61a0ab7
commit 29001b651b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkother.cpp
View File

@ -1613,14 +1613,13 @@ void CheckOther::checkConstPointer()
const int indirect = p->isArray() ? p->dimensions().size() : 1;
if (isVariableChanged(start, p->scope()->bodyEnd, indirect, p->declarationId(), false, mSettings, mTokenizer->isCPP()))
continue;
if (p->isArgument() && p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
continue;
if (p->typeStartToken() && !p->typeStartToken()->originalName().empty())
if (p->typeStartToken() && p->typeStartToken()->isSimplifiedTypedef() && !(Token::simpleMatch(p->typeEndToken(), "*") && !p->typeEndToken()->isSimplifiedTypedef()))
continue;
constVariableError(p, p->isArgument() ? p->scope()->function : nullptr);
}
}
}
void CheckOther::constVariableError(const Variable *var, const Function *function)
{
if (!var) {

14
lib/tokenlist.cpp
View File

@ -1926,20 +1926,24 @@ void TokenList::simplifyPlatformTypes()
Token *typeToken;
if (platformtype->mConstPtr) {
tok->str("const");
tok->insertToken("*");
tok->insertToken(platformtype->mType);
tok->isSimplifiedTypedef(true);
tok->insertToken("*")->isSimplifiedTypedef(true);
tok->insertToken(platformtype->mType)->isSimplifiedTypedef(true);
typeToken = tok;
} else if (platformtype->mPointer) {
tok->str(platformtype->mType);
tok->isSimplifiedTypedef(true);
typeToken = tok;
tok->insertToken("*");
tok->insertToken("*")->isSimplifiedTypedef(true);
} else if (platformtype->mPtrPtr) {
tok->str(platformtype->mType);
tok->isSimplifiedTypedef(true);
typeToken = tok;
tok->insertToken("*");
tok->insertToken("*");
tok->insertToken("*")->isSimplifiedTypedef(true);
tok->insertToken("*")->isSimplifiedTypedef(true);
} else {
tok->str(platformtype->mType);
tok->isSimplifiedTypedef(true);
typeToken = tok;
}
if (platformtype->mSigned)

7
test/testother.cpp
View File

@ -3837,6 +3837,13 @@ private:
" qsort(p, nmemb, size, cmp);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
check("void g(bool *r, std::size_t *b) {\n" // #12129
" if (*r && *b >= 5) {}\n"
"}\n");
ASSERT_EQUALS("[test.cpp:1]: (style) Parameter 'r' can be declared as pointer to const\n"
"[test.cpp:1]: (style) Parameter 'b' can be declared as pointer to const\n",
errout.str());
}
void switchRedundantAssignmentTest() {