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

refactoring the fix for #1191

This commit is contained in:
Daniel Marjamäki 2010-01-01 19:49:33 +01:00
parent f8bd59f5b5
commit b0d7623dcf
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/checkother.cpp
View File

@ -1318,7 +1318,7 @@ class CheckUninitVar : public ExecutionPath
public: public:
// Startup constructor // Startup constructor
CheckUninitVar(Check *c) CheckUninitVar(Check *c)
: ExecutionPath(c, 0), pointer(false), array(false), alloc(false), suppress(false) : ExecutionPath(c, 0), pointer(false), array(false), alloc(false)
{ {
} }
@ -1333,7 +1333,7 @@ private:
// internal constructor for creating extra checks // internal constructor for creating extra checks
CheckUninitVar(Check *c, unsigned int v, const std::string &name, bool p, bool a) CheckUninitVar(Check *c, unsigned int v, const std::string &name, bool p, bool a)
: ExecutionPath(c, v), varname(name), pointer(p), array(a), alloc(false), suppress(false) : ExecutionPath(c, v), varname(name), pointer(p), array(a), alloc(false)
{ {
} }
@ -1341,7 +1341,6 @@ private:
const bool pointer; const bool pointer;
const bool array; const bool array;
bool alloc; bool alloc;
bool suppress; // suppression of errors
// p = malloc .. // p = malloc ..
static void alloc_pointer(std::list<ExecutionPath *> &checks, unsigned int varid) static void alloc_pointer(std::list<ExecutionPath *> &checks, unsigned int varid)
@ -1397,7 +1396,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->pointer && !c->alloc && !c->suppress) if (c->pointer && !c->alloc)
{ {
CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner); CheckOther *checkOther = dynamic_cast<CheckOther *>(c->owner);
if (checkOther) if (checkOther)
@ -1429,7 +1428,7 @@ private:
for (it = checks.begin(); it != checks.end(); ++it) for (it = checks.begin(); it != checks.end(); ++it)
{ {
CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it); CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it);
if (c && c->varId == varid && !c->suppress) if (c && c->varId == varid)
{ {
// mode 0 : the variable is used "directly" // mode 0 : the variable is used "directly"
// example: .. = var; // example: .. = var;
@ -1514,15 +1513,19 @@ private:
// Suppress warnings if variable in inner scope has same name as variable in outer scope // Suppress warnings if variable in inner scope has same name as variable in outer scope
if (!tok.isStandardType()) if (!tok.isStandardType())
{ {
bool dup = false; std::set<unsigned int> dup;
for (std::list<ExecutionPath *>::const_iterator it = checks.begin(); it != checks.end(); ++it) for (std::list<ExecutionPath *>::const_iterator it = checks.begin(); it != checks.end(); ++it)
{ {
CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it); CheckUninitVar *c = dynamic_cast<CheckUninitVar *>(*it);
if (c && c->varname == vartok->str() && c->varId != vartok->varId()) if (c && c->varname == vartok->str() && c->varId != vartok->varId())
c->suppress = dup = true; dup.insert(c->varId);
} }
if (dup) if (!dup.empty())
{
for (std::set<unsigned int>::const_iterator it = dup.begin(); it != dup.end(); ++it)
bailOutVar(checks, *it);
return; return;
}
} }
if (a || p || tok.isStandardType()) if (a || p || tok.isStandardType())