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

Merge remote-tracking branch 'origin/master' into topic/matthias/opaque

Browse source
This commit is contained in:
Matthias Vallentin 2012-12-11 16:32:01 -08:00
commit 816965f3c7
268 changed files with 2216 additions and 463 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Val.cc
View file

@ -3149,6 +3149,9 @@ bool OpaqueVal::DoUnserialize(UnserialInfo* info)
Val* check_and_promote(Val* v, const BroType* t, int is_init)
{
if ( ! v )
return 0;
BroType* vt = v->Type();
vt = flatten_type(vt);