Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-12 03:28:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

GH-591: fix reading set[enum] values from input files

Browse source
This commit is contained in:
Jon Siwek 2019-10-02 21:03:30 -07:00
parent 8ba19cd7d1
commit fd66e7b9f6
4 changed files with 93 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/input/Manager.cc
View file

@ -2536,8 +2536,31 @@ Val* Manager::ValueToVal(const Stream* i, const Value* val, bool& have_error) co
if ( stag == TYPE_VOID )
TypeTag stag = val->val.set_val.vals[0]->type;
set_index = new TypeList(base_type(stag)->Ref());
set_index->Append(base_type(stag)->Ref());
BroType* index_type;
if ( stag == TYPE_ENUM )
{
// Enums are not a base-type, so need to look it up.
const auto& sv = val->val.set_val.vals[0]->val.string_val;
std::string enum_name(sv.data, sv.length);
auto enum_id = global_scope()->Lookup(enum_name);
if ( ! enum_id )
{
Warning(i, "Value '%s' for stream '%s' is not a valid enum.",
enum_name.data(), i->name.c_str());
have_error = true;
return nullptr;
}
index_type = enum_id->Type()->AsEnumType();
}
else
index_type = base_type_no_ref(stag);
set_index = new TypeList(index_type);
set_index->Append(index_type->Ref());
}
SetType* s = new SetType(set_index, 0);