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

valueFlowContainerSize: Handle guard logic

This commit is contained in:
Daniel Marjamäki 2018-08-11 15:08:54 +02:00
parent f0c1d49abf
commit 811a71aa06
2 changed files with 35 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/valueflow.cpp
View File

@ -3431,6 +3431,31 @@ static void valueFlowUninit(TokenList *tokenlist, SymbolDatabase * /*symbolDatab
}
}
static bool hasContainerSizeGuard(const Token *tok, unsigned int containerId)
{
for (; tok && tok->astParent(); tok = tok->astParent()) {
const Token *parent = tok->astParent();
if (tok != parent->astOperand2())
continue;
if (!Token::Match(parent, "%oror%|&&|?"))
continue;
// is container found in lhs?
std::stack<const Token *> tokens;
tokens.push(parent->astOperand1());
while (!tokens.empty()) {
const Token *t = tokens.top();
tokens.pop();
if (!t)
continue;
if (t->varId() == containerId)
return true;
tokens.push(t->astOperand1());
tokens.push(t->astOperand2());
}
}
return false;
}
static void valueFlowContainerReverse(const Token *tok, unsigned int containerId, const ValueFlow::Value &value, const Settings *settings)
{
while (nullptr != (tok = tok->previous())) {
@ -3444,7 +3469,8 @@ static void valueFlowContainerReverse(const Token *tok, unsigned int containerId
break;
if (Token::Match(tok, "%name% . %name% (") && tok->valueType()->container->getAction(tok->strAt(2)) != Library::Container::Action::NO_ACTION)
break;
setTokenValue(const_cast<Token *>(tok), value, settings);
if (!hasContainerSizeGuard(tok, containerId))
setTokenValue(const_cast<Token *>(tok), value, settings);
}
}
@ -3461,7 +3487,8 @@ static void valueFlowContainerForward(const Token *tok, unsigned int containerId
break;
if (Token::Match(tok, "%name% . %name% (") && tok->valueType()->container->getAction(tok->strAt(2)) != Library::Container::Action::NO_ACTION)
break;
setTokenValue(const_cast<Token *>(tok), value, settings);
if (!hasContainerSizeGuard(tok, containerId))
setTokenValue(const_cast<Token *>(tok), value, settings);
}
}

6
test/testvalueflow.cpp
View File

@ -3319,6 +3319,12 @@ private:
" }\n"
"}";
ASSERT_EQUALS("", isKnownContainerSizeValue(tokenValues(code, "ints . front"), 0));
code = "void f(const std::vector<int> &v) {\n"
" if (v.empty()) {}\n"
" if (!v.empty() && v[10]==0) {}\n" // <- no container size for 'v[10]'
"}";
ASSERT(tokenValues(code, "v [").empty());
}
};