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

Bug hunting; Make cve.py happy again

This commit is contained in:
Daniel Marjamäki 2020-06-21 08:49:32 +02:00
parent f270ca1909
commit ff445f9ca2
1 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
lib/exprengine.cpp
View File

@ -177,6 +177,29 @@ static std::string str(ExprEngine::ValuePtr val)
return ret.str(); return ret.str();
} }
static size_t extfind(const std::string &str, const std::string &what, size_t pos)
{
int indent = 0;
for (; pos < str.size(); ++pos) {
if (indent <= 0 && str[pos] == what[0])
return pos;
else if (str[pos] == '\"') {
++pos;
while (pos < str.size()) {
if (str[pos] == '\"')
break;
if (pos == '\\')
++pos;
++pos;
}
} else if (str[pos] == '(')
++indent;
else if (str[pos] == ')')
--indent;
}
return std::string::npos;
}
std::string ExprEngine::str(int128_t value) std::string ExprEngine::str(int128_t value)
{ {
std::ostringstream ostr; std::ostringstream ostr;
@ -535,6 +558,8 @@ namespace {
std::ostringstream ret; std::ostringstream ret;
std::map<std::string, ExprEngine::ValuePtr> vars; std::map<std::string, ExprEngine::ValuePtr> vars;
for (const auto mem: memory) { for (const auto mem: memory) {
if (!mem.second)
continue;
const Variable *var = tokenizer->getSymbolDatabase()->getVariableFromVarId(mem.first); const Variable *var = tokenizer->getSymbolDatabase()->getVariableFromVarId(mem.first);
if (var && var->isLocal()) if (var && var->isLocal())
continue; continue;
@ -586,7 +611,7 @@ namespace {
int varid = mem.first; int varid = mem.first;
const std::string &name = mem.second; const std::string &name = mem.second;
auto it = memory.find(varid); auto it = memory.find(varid);
if (it != memory.end() && it->second->name == name) if (it != memory.end() && it->second && it->second->name == name)
continue; continue;
if (name.empty()) { if (name.empty()) {
if (it != memory.end()) if (it != memory.end())
@ -652,12 +677,12 @@ namespace {
const std::string::size_type eq = line.find("=", pos); const std::string::size_type eq = line.find("=", pos);
const std::string lhs = line.substr(pos, eq-pos); const std::string lhs = line.substr(pos, eq-pos);
pos = eq + 1; pos = eq + 1;
const std::string::size_type end = line.find(" ", pos); const std::string::size_type end = extfind(line, " ", pos);
const std::string rhs = line.substr(pos, end-pos); const std::string rhs = line.substr(pos, end-pos);
pos = end; pos = end;
d.sym[lhs] = rhs; d.sym[lhs] = rhs;
} else if (line[pos] == '(') { } else if (line[pos] == '(') {
const std::string::size_type end = line.find(" ", pos); const std::string::size_type end = extfind(line, " ", pos);
const std::string c = line.substr(pos, end-pos); const std::string c = line.substr(pos, end-pos);
pos = end; pos = end;
d.constraints.push_back(c); d.constraints.push_back(c);
@ -1760,7 +1785,7 @@ static ExprEngine::ValuePtr executeFunctionCall(const Token *tok, Data &data)
// Execute subfunction.. // Execute subfunction..
if (function->hasBody()) { if (function->hasBody()) {
const Scope *functionScope = function->functionScope; const Scope * const functionScope = function->functionScope;
int argnr = 0; int argnr = 0;
std::map<const Token *, nonneg int> refs; std::map<const Token *, nonneg int> refs;
for (const Variable &arg: function->argumentList) { for (const Variable &arg: function->argumentList) {