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

Fixed #2975 (False positive: Return of the address of an auto-variable)

This commit is contained in:
Daniel Marjamäki 2011-08-10 18:16:31 +02:00
parent a30da73d3e
commit 9a24492a00
3 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/checkautovariables.cpp
View File

@ -56,6 +56,14 @@ bool CheckAutoVariables::isAutoVar(unsigned int varId)
if (!var || !var->isLocal() || var->isStatic() || var->isArray() || var->typeEndToken()->str() == "*")
return false;
if (Token::simpleMatch(var->nameToken()->previous(), "&"))
{
// address of reference variable can be taken if the address
// of the variable it points at is not a auto-var
// TODO: check what the reference variable references.
return false;
}
return true;
}

31
lib/tokenize.cpp
View File

@ -2082,20 +2082,23 @@ void Tokenizer::simplifyMulAnd(void)
{
for (Token *tok = _tokens; tok; tok = tok->next())
{
//fix Ticket #2784
if (Token::Match(tok->next(), "* & %any% ="))
if (Token::Match(tok, "[;{}] *"))
{
tok->deleteNext(); //del *
tok->deleteNext(); //del &
continue;
}
if (Token::Match(tok->next(), "* ( & %any% ) ="))
{
tok->deleteNext(); //del *
tok->deleteNext(); //del (
tok->deleteNext(); //del &
tok->next()->deleteNext(); //del )
continue;
//fix Ticket #2784
if (Token::Match(tok->next(), "* & %any% ="))
{
tok->deleteNext(); //del *
tok->deleteNext(); //del &
continue;
}
if (Token::Match(tok->next(), "* ( & %any% ) ="))
{
tok->deleteNext(); //del *
tok->deleteNext(); //del (
tok->deleteNext(); //del &
tok->next()->deleteNext(); //del )
continue;
}
}
}
}
@ -2115,7 +2118,7 @@ bool Tokenizer::tokenize(std::istream &code,
createTokens(code);
// simplify '* & %any% =' to '%any% ='
// simplify '[;{}] * & %any% =' to '%any% ='
simplifyMulAnd();
// Convert C# code

12
test/testautovariables.cpp
View File

@ -77,6 +77,7 @@ private:
TEST_CASE(testautovar_array2);
TEST_CASE(testautovar_return1);
TEST_CASE(testautovar_return2);
TEST_CASE(testautovar_return3);
TEST_CASE(testautovar_extern);
TEST_CASE(testinvaliddealloc);
TEST_CASE(testassign1); // Ticket #1819
@ -257,6 +258,17 @@ private:
ASSERT_EQUALS("[test.cpp:6]: (error) Return of the address of an auto-variable\n", errout.str());
}
void testautovar_return3()
{
// #2975 - FP
check("void** f()\n"
"{\n"
" void *&value = tls[id];"
" return &value;"
"}");
ASSERT_EQUALS("", errout.str());
}
void testautovar_extern()
{
check("struct foo *f()\n"