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

--verify: Fix false negative in itc

This commit is contained in:
Daniel Marjamäki 2019-10-27 16:47:56 +01:00
parent 2fa9a29ea7
commit c899d7becf
1 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/exprengine.cpp
View File

@ -1068,19 +1068,26 @@ static ExprEngine::ValuePtr executeAddressOf(const Token *tok, Data &data)
static ExprEngine::ValuePtr executeDeref(const Token *tok, Data &data) static ExprEngine::ValuePtr executeDeref(const Token *tok, Data &data)
{ {
ExprEngine::ValuePtr pval = executeExpression(tok->astOperand1(), data); ExprEngine::ValuePtr pval = executeExpression(tok->astOperand1(), data);
if (pval) { if (!pval) {
auto addressOf = std::dynamic_pointer_cast<ExprEngine::AddressOfValue>(pval); auto v = getValueRangeFromValueType(data.getNewSymbolName(), tok->valueType(), *data.settings);
if (addressOf) { if (tok->astOperand1()->varId()) {
auto val = data.getValue(addressOf->varId, tok->valueType(), tok); pval = std::make_shared<ExprEngine::PointerValue>(data.getNewSymbolName(), v, false, false);
call(data.callbacks, tok, val, &data); data.assignValue(tok->astOperand1(), tok->astOperand1()->varId(), v);
return val;
}
auto pointer = std::dynamic_pointer_cast<ExprEngine::PointerValue>(pval);
if (pointer) {
auto val = pointer->data;
call(data.callbacks, tok, val, &data);
return val;
} }
call(data.callbacks, tok, v, &data);
return v;
}
auto addressOf = std::dynamic_pointer_cast<ExprEngine::AddressOfValue>(pval);
if (addressOf) {
auto val = data.getValue(addressOf->varId, tok->valueType(), tok);
call(data.callbacks, tok, val, &data);
return val;
}
auto pointer = std::dynamic_pointer_cast<ExprEngine::PointerValue>(pval);
if (pointer) {
auto val = pointer->data;
call(data.callbacks, tok, val, &data);
return val;
} }
return ExprEngine::ValuePtr(); return ExprEngine::ValuePtr();
} }