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

lint fixes: ensuring functions return values, robustness to nil Val's

Browse source
This commit is contained in:
Vern Paxson 2021-03-18 08:21:19 -07:00
parent e21c0f1115
commit 5a8ba8c3e5
4 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/frameworks/logging/main.zeek
View file

@ -713,6 +713,8 @@ function enable_stream(id: ID) : bool
if ( id in all_streams ) if ( id in all_streams )
active_streams[id] = all_streams[id]; active_streams[id] = all_streams[id];
return T;
} }
# convenience function to add a filter name to stream_filters # convenience function to add a filter name to stream_filters

2
scripts/base/protocols/conn/thresholds.zeek
View file

@ -217,7 +217,7 @@ function set_current_threshold(c: connection, ttype: threshold_type, is_orig: bo
return set_current_conn_packets_threshold(c$id, t, T); return set_current_conn_packets_threshold(c$id, t, T);
else if ( ttype == PACKETS && ! is_orig ) else if ( ttype == PACKETS && ! is_orig )
return set_current_conn_packets_threshold(c$id, t, F); return set_current_conn_packets_threshold(c$id, t, F);
else if ( ttype == DURATION ) else # ttype == DURATION
return set_current_conn_duration_threshold(c$id, td); return set_current_conn_duration_threshold(c$id, td);
} }

2
scripts/base/utils/directions-and-hosts.zeek
View file

@ -33,7 +33,7 @@ function id_matches_direction(id: conn_id, d: Direction): bool
return (o_local && !r_local) || (!o_local && r_local); return (o_local && !r_local) || (!o_local && r_local);
else if ( d == OUTBOUND ) else if ( d == OUTBOUND )
return o_local && !r_local; return o_local && !r_local;
else if ( d == INBOUND ) else # d == INBOUND
return !o_local && r_local; return !o_local && r_local;
} }

4
src/zeek.bif
View file

@ -68,6 +68,10 @@ static int check_fmt_type(zeek::TypeTag t, zeek::TypeTag ok[])
static void do_fmt(const char*& fmt, zeek::Val* v, zeek::ODesc* d) static void do_fmt(const char*& fmt, zeek::Val* v, zeek::ODesc* d)
{ {
if ( ! v )
// Help with error propagation in compiled code.
return;
zeek::TypeTag t = v->GetType()->Tag(); zeek::TypeTag t = v->GetType()->Tag();
zeek::InternalTypeTag it = v->GetType()->InternalType(); zeek::InternalTypeTag it = v->GetType()->InternalType();