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

Merge pull request #2706 from rikardfalkeborn/condition-fn-with-sizeof 

Fix FN with known condition and sizeof
This commit is contained in:
Daniel Marjamäki 2020-07-13 20:54:25 +02:00 committed by GitHub
parent cb221e970d d8e7e9176b
commit 33557012a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkcondition.cpp
View File

@ -1457,6 +1457,7 @@ void CheckCondition::alwaysTrueFalse()
// don't warn when condition checks sizeof result // don't warn when condition checks sizeof result
bool hasSizeof = false; bool hasSizeof = false;
bool hasNonNumber = false;
tokens.push(tok); tokens.push(tok);
while (!tokens.empty()) { while (!tokens.empty()) {
const Token *tok2 = tokens.top(); const Token *tok2 = tokens.top();
@ -1473,9 +1474,9 @@ void CheckCondition::alwaysTrueFalse()
tokens.push(tok2->astOperand1()); tokens.push(tok2->astOperand1());
tokens.push(tok2->astOperand2()); tokens.push(tok2->astOperand2());
} else } else
break; hasNonNumber = true;
} }
if (tokens.empty() && hasSizeof) if (!hasNonNumber && hasSizeof)
continue; continue;
alwaysTrueFalseError(tok, &tok->values().front()); alwaysTrueFalseError(tok, &tok->values().front());

5
test/testcondition.cpp
View File

@ -2987,14 +2987,17 @@ private:
// Avoid FP for sizeof condition // Avoid FP for sizeof condition
check("void f() {\n" check("void f() {\n"
" if (sizeof(char) != 123) {}\n" " if (sizeof(char) != 123) {}\n"
" if (123 != sizeof(char)) {}\n"
"}"); "}");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
check("void f() {\n" check("void f() {\n"
" int x = 123;\n" " int x = 123;\n"
" if (sizeof(char) != x) {}\n" " if (sizeof(char) != x) {}\n"
" if (x != sizeof(char)) {}\n"
"}"); "}");
ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'sizeof(char)!=x' is always true\n", errout.str()); ASSERT_EQUALS("[test.cpp:3]: (style) Condition 'sizeof(char)!=x' is always true\n"
"[test.cpp:4]: (style) Condition 'x!=sizeof(char)' is always true\n", errout.str());
// Don't warn in assertions. Condition is often 'always true' by intention. // Don't warn in assertions. Condition is often 'always true' by intention.
// If platform,defines,etc cause an 'always false' assertion then that is not very dangerous neither // If platform,defines,etc cause an 'always false' assertion then that is not very dangerous neither