Merge branch 'master' of git://git.bro-ids.org/bro into elasticsearch

This commit is contained in:
Vlad Grigorescu 2012-06-15 10:46:48 -04:00
commit 93a7a46af0
159 changed files with 1962 additions and 120 deletions

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;
}