Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-10 10:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

GH-1503: Improve &expire_func compatibility type-checking

Browse source 
Previously, incompatible &expire_funcs could mistakenly be used, such as
when using that attribute on the unspecified table()/set()
initializations/assignments, resulting in invalid function calls that
eventually crash Zeek.
This commit is contained in:
Jon Siwek 2021-04-12 16:27:50 -07:00
parent 0c93e2fcb8
commit 01f6264c87
6 changed files with 85 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

55
src/Type.cc
View file

@ -526,6 +526,61 @@ TableType::TableType(TypeListPtr ind, TypePtr yield)
}
}
bool TableType::CheckExpireFuncCompatibility(const detail::AttrPtr& attr)
{
assert(attr->Tag() == detail::ATTR_EXPIRE_FUNC);
const auto& expire_func = attr->GetExpr();
if ( expire_func->GetType()->Tag() != TYPE_FUNC )
{
attr->Error("&expire_func attribute is not a function");
return false;
}
const FuncType* e_ft = expire_func->GetType()->AsFuncType();
if ( e_ft->Flavor() != FUNC_FLAVOR_FUNCTION )
{
attr->Error("&expire_func attribute is not a function");
return false;
}
if ( e_ft->Yield()->Tag() != TYPE_INTERVAL )
{
attr->Error("&expire_func must yield a value of type interval");
return false;
}
if ( IsUnspecifiedTable() )
return true;
const auto& func_index_types = e_ft->ParamList()->GetTypes();
// Keep backwards compatibility with idx: any idiom.
if ( func_index_types.size() == 2 )
{
if ( func_index_types[1]->Tag() == TYPE_ANY )
return true;
}
const auto& table_index_types = GetIndexTypes();
std::vector<TypePtr> expected_args;
expected_args.reserve(1 + table_index_types.size());
expected_args.emplace_back(NewRef{}, this);
for ( const auto& t : table_index_types )
expected_args.emplace_back(t);
if ( ! e_ft->CheckArgs(expected_args) )
{
attr->Error("&expire_func argument type clash");
return false;
}
return true;
}
TypePtr TableType::ShallowClone()
{
return make_intrusive<TableType>(indices, yield_type);