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

Fix #11805 FP uninitvar for stringstream into deref pointer to uninit var / #11804 FP uninitvar for array in struct in struct (#5311)

This commit is contained in:
chrchr-github 2023-08-11 18:45:58 +02:00 committed by GitHub
parent 76ffd21ecf
commit a7d487f6db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 48 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/astutils.cpp
View File

@ -3142,11 +3142,14 @@ ExprUsage getExprUsage(const Token* tok, int indirect, const Settings* settings)
return getExprUsage(tok->astParent()->astParent(), indirect, settings); return getExprUsage(tok->astParent()->astParent(), indirect, settings);
} }
if (indirect == 0) { if (indirect == 0) {
if (Token::Match(tok->astParent(), "%cop%|%assign%|++|--") && !Token::simpleMatch(tok->astParent(), "=") && if (Token::Match(tok->astParent(), "%cop%|%assign%|++|--") && !Token::Match(tok->astParent(), "=|>>") &&
!tok->astParent()->isUnaryOp("&")) !tok->astParent()->isUnaryOp("&"))
return ExprUsage::Used; return ExprUsage::Used;
if (Token::simpleMatch(tok->astParent(), "=") && astIsRHS(tok)) if (Token::simpleMatch(tok->astParent(), "=") && astIsRHS(tok)) {
if (tok->astParent()->astOperand1() && tok->astParent()->astOperand1()->variable() && tok->astParent()->astOperand1()->variable()->isReference())
return ExprUsage::NotUsed;
return ExprUsage::Used; return ExprUsage::Used;
}
// Function call or index // Function call or index
if (((Token::simpleMatch(tok->astParent(), "(") && !tok->astParent()->isCast()) || (Token::simpleMatch(tok->astParent(), "[") && tok->valueType())) && if (((Token::simpleMatch(tok->astParent(), "(") && !tok->astParent()->isCast()) || (Token::simpleMatch(tok->astParent(), "[") && tok->valueType())) &&
(astIsLHS(tok) || Token::simpleMatch(tok->astParent(), "( )"))) (astIsLHS(tok) || Token::simpleMatch(tok->astParent(), "( )")))

2
lib/checkuninitvar.cpp
View File

@ -1579,7 +1579,7 @@ static bool isLeafDot(const Token* tok)
const Token * parent = tok->astParent(); const Token * parent = tok->astParent();
if (!Token::simpleMatch(parent, ".")) if (!Token::simpleMatch(parent, "."))
return false; return false;
if (parent->astOperand2() == tok) if (parent->astOperand2() == tok && !Token::simpleMatch(parent->astParent(), "."))
return true; return true;
return isLeafDot(parent); return isLeafDot(parent);
} }

42
test/testuninitvar.cpp
View File

@ -6127,6 +6127,48 @@ private:
" int *q = 1 ? &y : 0;\n" " int *q = 1 ? &y : 0;\n"
"}\n"); "}\n");
ASSERT_EQUALS("", errout.str()); ASSERT_EQUALS("", errout.str());
valueFlowUninit("void f(std::stringstream& ss) {\n" // #11805
" int x;\n"
" int* p = &x;\n"
" ss >> *p;\n"
"}\n"
"void g() {\n"
" int x;\n"
" int* p = &x;\n"
" int& r = *p;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
valueFlowUninit("void f(std::stringstream& ss) {\n" // #11805
" int x;\n"
" int* p = &x;\n"
" ss >> *p;\n"
"}\n"
"void g() {\n"
" int x;\n"
" int* p = &x;\n"
" int& r = *p;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
valueFlowUninit("struct S1 { char a[10]; };\n" // #11804
"struct S2 { struct S1 s1; };\n"
"void init(char* c);\n"
"void f() {\n"
" struct S2 s2;\n"
" init(s2.s1.a);\n"
"}\n");
ASSERT_EQUALS("", errout.str());
valueFlowUninit("struct S { int i; };\n" // #11731
"void f(const S*& p);\n"
"int g() {\n"
" const S* s;\n"
" f(s);\n"
" return s->i;\n"
"}\n");
ASSERT_EQUALS("", errout.str());
} }
void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value void valueFlowUninitBreak() { // Do not show duplicate warnings about the same uninitialized value