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

Fixing key size calculation in composite hash code.

Browse source
This commit is contained in:
Robin Sommer 2011-08-18 14:11:55 -07:00
parent b7d421dbc4
commit 2636ec4679
3 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
1.6-dev-1118 | 2011-08-18 14:11:55 -0700
* Fixing key size calculation in composite hash code. (Robin Sommer)
1.6-dev-1116 | 2011-08-18 10:05:07 -0700 1.6-dev-1116 | 2011-08-18 10:05:07 -0700
* Remove the 'net' type from Bro (addresses #535). * Remove the 'net' type from Bro (addresses #535).

2
VERSION
View file

@ -1 +1 @@
1.6-dev-1116 1.6-dev-1118

2
src/CompHash.cc
View file

@ -393,7 +393,7 @@ int CompositeHash::SingleTypeKeySize(BroType* bt, const Val* v,
sz = SingleTypeKeySize(rt->FieldType(i), sz = SingleTypeKeySize(rt->FieldType(i),
rv ? rv->Lookup(i) : 0, rv ? rv->Lookup(i) : 0,
type_check, sz, optional); type_check, sz, v && optional);
if ( ! sz ) if ( ! sz )
return 0; return 0;
} }