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

broker: Support publish() of unspecified set() / table()

Browse source 
Calling Broker::make_event(..., table()) or Broker::publish(..., table())
caused runtime type errors as same_type() would result in false.
This commit is contained in:
Arne Welzel 2024-11-06 12:10:41 +01:00
parent 189565d131
commit 91c03cd988
4 changed files with 155 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/broker/Manager.cc
View file

@ -17,6 +17,7 @@
#include "zeek/Reporter.h"
#include "zeek/RunState.h"
#include "zeek/SerializationFormat.h"
#include "zeek/Type.h"
#include "zeek/Var.h"
#include "zeek/broker/Data.h"
#include "zeek/broker/Store.h"
@ -890,13 +891,18 @@ zeek::RecordValPtr Manager::MakeEvent(ArgsSpan args) {
continue;
}
const auto& got_type = arg_val->GetType();
auto got_type = arg_val->GetType();
const auto& expected_type = func->GetType()->ParamList()->GetTypes()[index - 1];
// If called with an unspecified table or set, adopt the expected type.
if ( got_type->Tag() == TYPE_TABLE && got_type->AsTableType()->IsUnspecifiedTable() )
if ( expected_type->Tag() == TYPE_TABLE && got_type->IsSet() == expected_type->IsSet() )
got_type = expected_type;
if ( ! same_type(got_type, expected_type) ) {
rval->Remove(0);
Error("event parameter #%zu type mismatch, got %s, expect %s", index, type_name(got_type->Tag()),
type_name(expected_type->Tag()));
Error("event parameter #%zu type mismatch, got %s, expect %s", index,
obj_desc_short(got_type.get()).c_str(), obj_desc_short(expected_type.get()).c_str());
return rval;
}