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

Merge remote-tracking branch 'origin/master' into topic/bernhard/sqlite

Browse source
This commit is contained in:
Bernhard Amann 2012-06-14 15:15:58 -07:00
commit 0a439b6b61
12 changed files with 64 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/logging/Manager.cc
View file

@ -828,7 +828,13 @@ threading::Value* Manager::ValToLogVal(Val* val, BroType* ty)
const char* s =
val->Type()->AsEnumType()->Lookup(val->InternalInt());
lval->val.string_val = new string(s);
if ( s )
lval->val.string_val = new string(s);
else
{
val->Type()->Error("enum type does not contain value", val);
lval->val.string_val = new string();
}
break;
}