Fixed #1166 (improve check: using uninitialized pointer to create reference 'int &r(*p);')
This commit is contained in:
parent
71b328d703
commit
2a28ca72cc
|
@ -1378,7 +1378,7 @@ private:
|
||||||
CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it);
|
CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it);
|
||||||
if (c && c->varId == varid)
|
if (c && c->varId == varid)
|
||||||
{
|
{
|
||||||
if (!c->alloc)
|
if (c->pointer && !c->alloc)
|
||||||
{
|
{
|
||||||
CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner);
|
CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner);
|
||||||
if (checkOther)
|
if (checkOther)
|
||||||
|
@ -1424,6 +1424,10 @@ private:
|
||||||
if (mode == 2 && !c->pointer)
|
if (mode == 2 && !c->pointer)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
|
// mode 3 : using dead pointer is invalid.
|
||||||
|
if (mode == 3 && (!c->pointer || c->alloc))
|
||||||
|
continue;
|
||||||
|
|
||||||
CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner);
|
CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner);
|
||||||
if (checkOther)
|
if (checkOther)
|
||||||
{
|
{
|
||||||
|
@ -1472,6 +1476,17 @@ private:
|
||||||
use(foundError, checks, tok, 2);
|
use(foundError, checks, tok, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Using variable.. if it's a dead pointer the usage is invalid.
|
||||||
|
* @param foundError this is set to true if an error is found
|
||||||
|
* @param checks all available checks
|
||||||
|
* @param tok variable token
|
||||||
|
*/
|
||||||
|
static void use_dead_pointer(bool &foundError, std::list<ExecutionPath *> &checks, const Token *tok)
|
||||||
|
{
|
||||||
|
use(foundError, checks, tok, 3);
|
||||||
|
}
|
||||||
|
|
||||||
const Token *parse(const Token &tok, bool &foundError, std::list<ExecutionPath *> &checks) const
|
const Token *parse(const Token &tok, bool &foundError, std::list<ExecutionPath *> &checks) const
|
||||||
{
|
{
|
||||||
// Variable declaration..
|
// Variable declaration..
|
||||||
|
@ -1583,6 +1598,9 @@ private:
|
||||||
|
|
||||||
else if (tok2->varId())
|
else if (tok2->varId())
|
||||||
{
|
{
|
||||||
|
if (Token::Match(tok2->tokAt(-2), "[(,] *"))
|
||||||
|
use_dead_pointer(foundError, checks, tok2);
|
||||||
|
|
||||||
// it is possible that the variable is initialized here
|
// it is possible that the variable is initialized here
|
||||||
ExecutionPath::bailOutVar(checks, tok2->varId());
|
ExecutionPath::bailOutVar(checks, tok2->varId());
|
||||||
}
|
}
|
||||||
|
|
|
@ -1006,6 +1006,13 @@ private:
|
||||||
"}\n");
|
"}\n");
|
||||||
ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
|
ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
|
||||||
|
|
||||||
|
checkUninitVar("static void foo()\n"
|
||||||
|
"{\n"
|
||||||
|
" int *x;\n"
|
||||||
|
" int &y(*x);\n"
|
||||||
|
"}\n");
|
||||||
|
ASSERT_EQUALS("[test.cpp:4]: (error) Uninitialized variable: x\n", errout.str());
|
||||||
|
|
||||||
checkUninitVar("static int foo()\n"
|
checkUninitVar("static int foo()\n"
|
||||||
"{\n"
|
"{\n"
|
||||||
" int ret;\n"
|
" int ret;\n"
|
||||||
|
|
Loading…
Reference in New Issue