mirror of
https://github.com/zeek/zeek.git
synced 2025-10-12 19:48:20 +00:00
Merge remote branch 'origin/topic/robin/optional-fields' into topic/logging-framework
This commit is contained in:
commit
c985aa9d82
1 changed files with 1 additions and 1 deletions
|
@ -407,7 +407,7 @@ int CompositeHash::SingleTypeKeySize(BroType* bt, const Val* v,
|
||||||
|
|
||||||
case TYPE_INTERNAL_STRING:
|
case TYPE_INTERNAL_STRING:
|
||||||
if ( ! v )
|
if ( ! v )
|
||||||
return 0;
|
return optional ? sz : 0;
|
||||||
|
|
||||||
// Factor in length field.
|
// Factor in length field.
|
||||||
sz = SizeAlign(sz, sizeof(int));
|
sz = SizeAlign(sz, sizeof(int));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue