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

GH-1487: Handle error from ValueToVal instead of ignoring it

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-04-01 14:38:17 -07:00
parent 2beaee9318
commit d6116b0141
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/threading/SerialTypes.cc
View file

@ -557,14 +557,17 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
}
auto s = make_intrusive<SetType>(std::move(set_index), nullptr);
auto* t = new TableVal(std::move(s));
auto t = make_intrusive<TableVal>(std::move(s));
for ( int j = 0; j < val->val.set_val.size; j++ )
{
Val* assignval = ValueToVal(source, val->val.set_val.vals[j], have_error);
if ( have_error )
return nullptr;
t->Assign({AdoptRef{}, assignval}, nullptr);
}
return t;
return t.release();
}
case TYPE_VECTOR:
@ -589,6 +592,9 @@ Val* Value::ValueToVal(const std::string& source, const Value* val, bool& have_e
for ( int j = 0; j < val->val.vector_val.size; j++ )
{
auto el = ValueToVal(source, val->val.vector_val.vals[j], have_error);
if ( have_error )
return nullptr;
v->Assign(j, {AdoptRef{}, el});
}