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

Move an assert() in input/Manager.cc to account for ValueToVal errors

Browse source
This commit is contained in:
Jon Siwek 2021-04-12 14:21:41 -07:00
parent e5d3d009fc
commit 2793984607
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/input/Manager.cc
View file

@ -1726,7 +1726,6 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals)
TableStream* stream = (TableStream*) i; TableStream* stream = (TableStream*) i;
bool convert_error = false; bool convert_error = false;
Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error); Val* idxval = ValueToIndexVal(i, stream->num_idx_fields, stream->itype, vals, convert_error);
assert(idxval != nullptr);
readVals = stream->num_idx_fields + stream->num_val_fields; readVals = stream->num_idx_fields + stream->num_val_fields;
bool streamresult = true; bool streamresult = true;
@ -1736,6 +1735,8 @@ bool Manager::Delete(ReaderFrontend* reader, Value* *vals)
return false; return false;
} }
assert(idxval != nullptr);
if ( stream->pred || stream->event ) if ( stream->pred || stream->event )
{ {
auto val = stream->tab->FindOrDefault({NewRef{}, idxval}); auto val = stream->tab->FindOrDefault({NewRef{}, idxval});