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

Verification; struct pointer member

This commit is contained in:
Daniel Marjamäki 2019-12-29 18:42:35 +01:00
parent 2710a94b4b
commit 9723b28385
2 changed files with 44 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/exprengine.cpp
View File

@ -1142,9 +1142,20 @@ static ExprEngine::ValuePtr executeDot(const Token *tok, Data &data)
if (!structValue) { if (!structValue) {
if (tok->originalName() == "->") { if (tok->originalName() == "->") {
std::shared_ptr<ExprEngine::ArrayValue> pointerValue = std::dynamic_pointer_cast<ExprEngine::ArrayValue>(data.getValue(tok->astOperand1()->varId(), nullptr, nullptr)); std::shared_ptr<ExprEngine::ArrayValue> pointerValue = std::dynamic_pointer_cast<ExprEngine::ArrayValue>(data.getValue(tok->astOperand1()->varId(), nullptr, nullptr));
if (pointerValue && pointerValue->pointer && pointerValue->data.size() == 1) { if (pointerValue && pointerValue->pointer && !pointerValue->data.empty()) {
call(data.callbacks, tok->astOperand1(), pointerValue, &data); call(data.callbacks, tok->astOperand1(), pointerValue, &data);
structValue = std::dynamic_pointer_cast<ExprEngine::StructValue>(pointerValue->data[0].value); auto indexValue = std::make_shared<ExprEngine::IntRange>("0", 0, 0);
ExprEngine::ValuePtr ret;
for (auto val: pointerValue->read(indexValue)) {
structValue = std::dynamic_pointer_cast<ExprEngine::StructValue>(val.second);
if (structValue) {
auto memberValue = structValue->getValueOfMember(tok->astOperand2()->str());
call(data.callbacks, tok, memberValue, &data);
if (!ret)
ret = memberValue;
}
}
return ret;
} else { } else {
call(data.callbacks, tok->astOperand1(), data.getValue(tok->astOperand1()->varId(), nullptr, nullptr), &data); call(data.callbacks, tok->astOperand1(), data.getValue(tok->astOperand1()->varId(), nullptr, nullptr), &data);
} }
@ -1524,11 +1535,16 @@ static ExprEngine::ValuePtr createVariableValue(const Variable &var, Data &data)
if (valueType->pointer > 0) { if (valueType->pointer > 0) {
if (var.isLocal()) if (var.isLocal())
return std::make_shared<ExprEngine::UninitValue>(); return std::make_shared<ExprEngine::UninitValue>();
ValueType vt(*valueType); auto bufferSize = std::make_shared<ExprEngine::IntRange>(data.getNewSymbolName(), 1, ~0UL);
vt.pointer = 0; ExprEngine::ValuePtr pointerValue;
auto range = getValueRangeFromValueType(data.getNewSymbolName(), &vt, *data.settings); if (valueType->type == ValueType::Type::RECORD)
auto size = std::make_shared<ExprEngine::IntRange>(data.getNewSymbolName(), 1, ~0UL); pointerValue = createStructVal(valueType->typeScope, var.isLocal() && !var.isStatic(), data);
return std::make_shared<ExprEngine::ArrayValue>(data.getNewSymbolName(), size, range, true, true, true); else {
ValueType vt(*valueType);
vt.pointer = 0;
pointerValue = getValueRangeFromValueType(data.getNewSymbolName(), &vt, *data.settings);
}
return std::make_shared<ExprEngine::ArrayValue>(data.getNewSymbolName(), bufferSize, pointerValue, true, true, true);
} }
if (var.isArray()) if (var.isArray())
return std::make_shared<ExprEngine::ArrayValue>(&data, &var); return std::make_shared<ExprEngine::ArrayValue>(&data, &var);

30
test/testexprengine.cpp
View File

@ -81,7 +81,8 @@ private:
TEST_CASE(pointerAlias4); TEST_CASE(pointerAlias4);
TEST_CASE(pointerNull1); TEST_CASE(pointerNull1);
TEST_CASE(structMember); TEST_CASE(structMember1);
TEST_CASE(structMember2);
#endif #endif
} }
@ -415,19 +416,19 @@ private:
void pointer1() { void pointer1() {
const char code[] = "void f(unsigned char *p) { return *p == 7; }"; const char code[] = "void f(unsigned char *p) { return *p == 7; }";
ASSERT_EQUALS("size=$2,[:]=$1,null,->?", getRange(code, "p")); ASSERT_EQUALS("size=$1,[:]=$2,null,->?", getRange(code, "p"));
ASSERT_EQUALS("(declare-fun |$1:0| () Int)\n" ASSERT_EQUALS("(declare-fun |$2:0| () Int)\n"
"(assert (and (>= |$1:0| 0) (<= |$1:0| 255)))\n" "(assert (and (>= |$2:0| 0) (<= |$2:0| 255)))\n"
"(assert (= |$1:0| 7))\n" "(assert (= |$2:0| 7))\n"
"z3::sat", "z3::sat",
expr(code, "==")); expr(code, "=="));
} }
void pointer2() { void pointer2() {
const char code[] = "void f(unsigned char *p) { return p[2] == 7; }"; const char code[] = "void f(unsigned char *p) { return p[2] == 7; }";
ASSERT_EQUALS("(declare-fun |$1:2| () Int)\n" ASSERT_EQUALS("(declare-fun |$2:2| () Int)\n"
"(assert (and (>= |$1:2| 0) (<= |$1:2| 255)))\n" "(assert (and (>= |$2:2| 0) (<= |$2:2| 255)))\n"
"(assert (= |$1:2| 7))\n" "(assert (= |$2:2| 7))\n"
"z3::sat", "z3::sat",
expr(code, "==")); expr(code, "=="));
} }
@ -458,7 +459,7 @@ private:
} }
void structMember() { void structMember1() {
ASSERT_EQUALS("(declare-fun $2 () Int)\n" ASSERT_EQUALS("(declare-fun $2 () Int)\n"
"(declare-fun $3 () Int)\n" "(declare-fun $3 () Int)\n"
"(assert (and (>= $2 0) (<= $2 255)))\n" "(assert (and (>= $2 0) (<= $2 255)))\n"
@ -472,6 +473,17 @@ private:
"void f(struct S s) { return s.a + s.b == 0; }", "==")); "void f(struct S s) { return s.a + s.b == 0; }", "=="));
} }
void structMember2() {
const char code[] = "struct S { int x; };\n"
"void foo(struct S *s) { return s->x == 123; }";
const char expected[] = "(declare-fun $3 () Int)\n"
"(assert (and (>= $3 (- 2147483648)) (<= $3 2147483647)))\n"
"(assert (= $3 123))\n"
"z3::sat";
ASSERT_EQUALS(expected, expr(code, "=="));
}
}; };
REGISTER_TEST(TestExprEngine) REGISTER_TEST(TestExprEngine)