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

Reuse isVariableChanged() in auto variables

This commit is contained in:
Daniel Marjamäki 2018-06-24 08:55:23 +02:00
parent cde63c7573
commit d0819e4792
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/checkautovariables.cpp
View File

@ -206,19 +206,14 @@ void CheckAutoVariables::assignFunctionArg()
} }
} }
static bool reassignedGlobalPointer(const Token *vartok, unsigned int pointerVarId) static bool reassignedGlobalPointer(const Token *vartok, unsigned int pointerVarId, const Settings *settings, bool cpp)
{ {
const Token * const end = vartok->variable()->typeStartToken()->scope()->bodyEnd; return isVariableChanged(vartok,
for (const Token *tok2 = vartok; tok2 != nullptr && tok2 != end; tok2 = tok2->next()) { vartok->variable()->scope()->bodyEnd,
if (Token::Match(tok2, "%varid% =", pointerVarId)) pointerVarId,
return true; true,
if (Token::Match(tok2, "%name% (") && !Token::simpleMatch(tok2->linkAt(1), ") {")) { settings,
// Bailout: possibly written cpp);
// TODO: check if it is written
return true;
}
}
return false;
} }
@ -239,11 +234,11 @@ void CheckAutoVariables::autoVariables()
const Token * const pointer = tok->next(); const Token * const pointer = tok->next();
if (isAutoVarArray(tok->tokAt(3))) { if (isAutoVarArray(tok->tokAt(3))) {
const Token * const array = tok->tokAt(3); const Token * const array = tok->tokAt(3);
if (!reassignedGlobalPointer(array, pointer->varId())) if (!reassignedGlobalPointer(array, pointer->varId(), mSettings, mTokenizer->isCPP()))
errorAssignAddressOfLocalArrayToGlobalPointer(pointer, array); errorAssignAddressOfLocalArrayToGlobalPointer(pointer, array);
} else if (isAutoVar(tok->tokAt(4))) { } else if (isAutoVar(tok->tokAt(4))) {
const Token * const variable = tok->tokAt(4); const Token * const variable = tok->tokAt(4);
if (!reassignedGlobalPointer(variable, pointer->varId())) if (!reassignedGlobalPointer(variable, pointer->varId(), mSettings, mTokenizer->isCPP()))
errorAssignAddressOfLocalVariableToGlobalPointer(pointer, variable); errorAssignAddressOfLocalVariableToGlobalPointer(pointer, variable);
} }
} else if (Token::Match(tok, "[;{}] %var% . %var% = & %var%")) { } else if (Token::Match(tok, "[;{}] %var% . %var% = & %var%")) {