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

Fix issue 9842: ValueFlow: wrong handling of ?, seems to think that the whole expression is a condition (#2821)

This commit is contained in:
Paul Fultz II 2020-09-23 00:45:03 -05:00 committed by GitHub
parent 2e24cc1434
commit d9eacaecbb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/valueflow.cpp
View File

@ -2033,9 +2033,12 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, SymbolDatabase *symbo
Token::Match(tok, "%oror%|&& %name% %oror%|&&|)")) { Token::Match(tok, "%oror%|&& %name% %oror%|&&|)")) {
vartok = tok->next(); vartok = tok->next();
num = 0; num = 0;
} else if (Token::Match(tok, "[!?]") && Token::Match(tok->astOperand1(), "%name%")) { } else if (Token::simpleMatch(tok, "!") && Token::Match(tok->astOperand1(), "%name%")) {
vartok = tok->astOperand1(); vartok = tok->astOperand1();
num = 0; num = 0;
} else if (Token::simpleMatch(tok->astParent(), "?") && Token::Match(tok, "%name%")) {
vartok = tok;
num = 0;
} else { } else {
continue; continue;
} }
@ -2046,7 +2049,7 @@ static void valueFlowBeforeCondition(TokenList *tokenlist, SymbolDatabase *symbo
if (varid == 0U || !var) if (varid == 0U || !var)
continue; continue;
if (tok->str() == "?" && tok->isExpandedMacro()) { if (Token::simpleMatch(tok->astParent(), "?") && tok->astParent()->isExpandedMacro()) {
if (settings->debugwarnings) if (settings->debugwarnings)
bailout(tokenlist, errorLogger, tok, "variable " + var->name() + ", condition is defined in macro"); bailout(tokenlist, errorLogger, tok, "variable " + var->name() + ", condition is defined in macro");
continue; continue;

14
test/testnullpointer.cpp
View File

@ -100,6 +100,7 @@ private:
TEST_CASE(nullpointer57); // #9751 TEST_CASE(nullpointer57); // #9751
TEST_CASE(nullpointer58); // #9807 TEST_CASE(nullpointer58); // #9807
TEST_CASE(nullpointer59); // #9897 TEST_CASE(nullpointer59); // #9897
TEST_CASE(nullpointer60); // #9842
TEST_CASE(nullpointer_addressOf); // address of TEST_CASE(nullpointer_addressOf); // address of
TEST_CASE(nullpointerSwitch); // #2626 TEST_CASE(nullpointerSwitch); // #2626
TEST_CASE(nullpointer_cast); // #4692 TEST_CASE(nullpointer_cast); // #4692
@ -1878,6 +1879,19 @@ private:
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
} }
void nullpointer60() {
check("void f(){\n"
" char uuid[128];\n"
" char *s1;\n"
" memset(uuid, 0, sizeof(uuid));\n"
" s1 = strchr(uuid, '=');\n"
" s1 = s1 ? s1 + 1 : &uuid[5];\n"
" if (!strcmp(\"00000000000000000000000000000000\", s1) )\n"
" return;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
}
void nullpointer_addressOf() { // address of void nullpointer_addressOf() { // address of
check("void f() {\n" check("void f() {\n"
" struct X *x = 0;\n" " struct X *x = 0;\n"