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

Merge remote-tracking branch 'origin/topic/timw/606-json-nulls'

Browse source 
* origin/topic/timw/606-json-nulls:
  GH-606: Output nulls into json data if a field isn't set
This commit is contained in:
Jon Siwek 2019-09-30 17:39:50 -07:00
commit 97519e4350
8 changed files with 30 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Val.cc
View file

@ -458,6 +458,10 @@ TableVal* Val::GetRecordFields()
// This is a static method in this file to avoid including json.hpp in Val.h since it's huge.
static ZeekJson BuildJSON(Val* val, bool only_loggable=false, RE_Matcher* re=new RE_Matcher("^_"))
{
// If the value wasn't set, return a nullptr. This will get turned into a 'null' in the json output.
if ( ! val )
return nullptr;
ZeekJson j;
BroType* type = val->Type();
switch ( type->Tag() )
@ -2862,7 +2866,7 @@ int VectorVal::AddTo(Val* val, int /* is_first_init */) const
Val* VectorVal::Lookup(unsigned int index) const
{
if ( index >= val.vector_val->size() )
return 0;
return nullptr;
return (*val.vector_val)[index];
}