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

Val: cast_value_to_type() returns IntrusivePtr

Browse source
This commit is contained in:
Max Kellermann 2020-02-27 10:15:03 +01:00
parent 96951c1300
commit 3331abb4f2
4 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.cc
View file

@ -3206,7 +3206,7 @@ void delete_vals(val_list* vals)
}
}
Val* cast_value_to_type(Val* v, BroType* t)
IntrusivePtr<Val> cast_value_to_type(Val* v, BroType* t)
{
// Note: when changing this function, adapt all three of
// cast_value_to_type()/can_cast_value_to_type()/can_cast_value_to_type().
@ -3217,7 +3217,7 @@ Val* cast_value_to_type(Val* v, BroType* t)
// Always allow casting to same type. This also covers casting 'any'
// to the actual type.
if ( same_type(v->Type(), t) )
return v->Ref();
return {NewRef{}, v};
if ( same_type(v->Type(), bro_broker::DataVal::ScriptDataType()) )
{
@ -3226,7 +3226,7 @@ Val* cast_value_to_type(Val* v, BroType* t)
if ( ! dv )
return nullptr;
return static_cast<bro_broker::DataVal *>(dv)->castTo(t).release();
return static_cast<bro_broker::DataVal *>(dv)->castTo(t);
}
return nullptr;