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

Fix #11976 FP incorrectStringBooleanError in assert (#5415)

This commit is contained in:
chrchr-github 2023-09-12 10:05:51 +02:00 committed by GitHub
parent 02b836baad
commit 18ee859737
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/astutils.cpp
View File

@ -2246,7 +2246,7 @@ T* getTokenArgumentFunctionImpl(T* tok, int& argn)
parent = parent->astParent(); parent = parent->astParent();
// passing variable to subfunction? // passing variable to subfunction?
if (Token::Match(parent, "[*[(,{]")) if (Token::Match(parent, "[*[(,{]") || Token::Match(parent, "%oror%|&&"))
; ;
else if (Token::simpleMatch(parent, ":")) { else if (Token::simpleMatch(parent, ":")) {
while (Token::Match(parent, "[?:]")) while (Token::Match(parent, "[?:]"))

6
lib/checkstring.cpp
View File

@ -255,9 +255,13 @@ void CheckString::strPlusCharError(const Token *tok)
static bool isMacroUsage(const Token* tok) static bool isMacroUsage(const Token* tok)
{ {
if (const Token* parent = tok->astParent()) { if (const Token* parent = tok->astParent()) {
while (parent && parent->isCast())
parent = parent->astParent();
if (!parent)
return false;
if (parent->isExpandedMacro()) if (parent->isExpandedMacro())
return true; return true;
if (parent->isUnaryOp("!")) { if (parent->isUnaryOp("!") || parent->isComparisonOp()) {
int argn{}; int argn{};
const Token* ftok = getTokenArgumentFunction(parent, argn); const Token* ftok = getTokenArgumentFunction(parent, argn);
if (ftok && !ftok->function()) if (ftok && !ftok->function())

6
test/teststring.cpp
View File

@ -799,6 +799,12 @@ private:
" return false;\n" " return false;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f(const int* p, const int* q) {\n"
" assert((p != NULL && q != NULL) || !\"abc\");\n"
" ASSERT((void*)(\"def\") == 0);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
void deadStrcmp() { void deadStrcmp() {