Skip to content

Fix FP uninitStructMember when other variable is only nonzero if struct member is initialized #5143

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
danmar merged 2 commits into from
Jun 10, 2023
Merged

Fix FP uninitStructMember when other variable is only nonzero if struct member is initialized #5143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
61b7983
Fix FP uninitStructMember when other variable is only nonzero if stru…
danmar Jun 10, 2023
2d82b88
fix
danmar Jun 10, 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
12 changes: 9 additions & 3 deletions lib/checkuninitvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,9 +418,15 @@ bool CheckUninitVar::checkScopeForVariable(const Token *tok, const Variable& var
continue;
}

// assignment with nonzero constant..
if (Token::Match(tok->previous(), "[;{}] %var% = - %name% ;"))
variableValue[tok->varId()] = !VariableValue(0);
// track values of other variables..
if (Token::Match(tok->previous(), "[;{}] %var% =")) {
if (tok->next()->astOperand2() && tok->next()->astOperand2()->hasKnownIntValue())
variableValue[tok->varId()] = VariableValue(tok->next()->astOperand2()->getKnownIntValue());
else if (Token::Match(tok->previous(), "[;{}] %var% = - %name% ;"))
variableValue[tok->varId()] = !VariableValue(0);
else
variableValue.erase(tok->varId());
}

// Inner scope..
else if (Token::simpleMatch(tok, "if (")) {
Expand Down
14 changes: 14 additions & 0 deletions test/testuninitvar.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4743,6 +4743,20 @@ class TestUninitVar : public TestFixture {
" char* q = (s).p;\n"
"}\n");
ASSERT_EQUALS("", errout.str());

// if with flag
checkUninitVar("struct AB { int a; int b; };\n"
"int f(int x) {\n"
" struct AB ab;\n"
" int flag = 0;\n"
" if (x == 0) {\n"
" flag = dostuff(&ab);\n"
" }\n"
" if (flag) {\n"
" a = ab.a;\n"
" }\n"
"}");
ASSERT_EQUALS("", errout.str());
}

void uninitvar2_while() {
Expand Down