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

Tweaking CheckUninitVar (<< and >> handling)

This commit is contained in:
Daniel Marjamäki 2018-04-22 16:39:57 +02:00
parent 7b10375683
commit cc4977e140
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/checkuninitvar.cpp
View File

@ -1012,7 +1012,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc al
return true; return true;
} }
if (_tokenizer->isCPP() && Token::Match(vartok->next(), "<<|>>")) { if (_tokenizer->isCPP() && Token::simpleMatch(vartok->next(), "<<")) {
// Is this calculation done in rhs? // Is this calculation done in rhs?
const Token *tok = vartok; const Token *tok = vartok;
while (Token::Match(tok, "%name%|.|::")) while (Token::Match(tok, "%name%|.|::"))
@ -1022,8 +1022,7 @@ bool CheckUninitVar::isVariableUsage(const Token *vartok, bool pointer, Alloc al
// Is variable a known POD type then this is a variable usage, // Is variable a known POD type then this is a variable usage,
// otherwise we assume it's not. // otherwise we assume it's not.
const Variable *var = vartok->variable(); return (vartok->valueType() && vartok->valueType()->isIntegral());
return (var && (var->typeStartToken()->isStandardType() || var->typeStartToken()->isEnumType()));
} }
if (alloc == NO_ALLOC && vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp()) if (alloc == NO_ALLOC && vartok->next() && vartok->next()->isOp() && !vartok->next()->isAssignmentOp())