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

Merge remote-tracking branch 'origin/topic/jsiwek/bit-1909'

Browse source 
I've moved the resizing loop into a static method of RecordVal.

* origin/topic/jsiwek/bit-1909:
  BIT-1909: fix invalid redef'd record field accesses
This commit is contained in:
Robin Sommer 2018-04-27 10:35:37 -07:00
commit 8df77aee09
13 changed files with 114 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/Val.cc
View file

@ -2722,6 +2722,8 @@ unsigned int TableVal::MemoryAllocation() const
+ table_hash->MemoryAllocation();
}
vector<RecordVal*> RecordVal::parse_time_records;
RecordVal::RecordVal(RecordType* t) : MutableVal(t)
{
origin = 0;
@ -2767,6 +2769,12 @@ RecordVal::RecordVal(RecordType* t) : MutableVal(t)
vl->append(def ? def->Ref() : 0);
Unref(def);
if ( is_parsing )
{
parse_time_records.emplace_back(this);
Ref();
}
}
}
@ -2832,6 +2840,29 @@ Val* RecordVal::LookupWithDefault(int field) const
return record_type->FieldDefault(field);
}
void RecordVal::ResizeParseTimeRecords()
{
for ( auto& rv : parse_time_records )
{
auto vs = rv->val.val_list_val;
auto rt = rv->record_type;
auto current_length = vs->length();
auto required_length = rt->NumFields();
if ( required_length > current_length )
{
vs->resize(required_length);
for ( auto i = current_length; i < required_length; ++i )
vs->replace(i, nullptr);
}
Unref(rv);
}
parse_time_records.clear();
}
Val* RecordVal::Lookup(const char* field, bool with_default) const
{
int idx = record_type->FieldOffset(field);