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

GH-1628: Return an error for duplicate record field names

Browse source
This commit is contained in:
Tim Wojtulewicz 2022-07-18 16:21:04 -07:00
parent d57ad3e405
commit b41a4bf06d
5 changed files with 28 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/base/init-bare.zeek
View file

@ -3493,8 +3493,6 @@ export {
free_space_start_filtering : int; free_space_start_filtering : int;
## minimum amount of free disk space required to continue document filtering ## minimum amount of free disk space required to continue document filtering
free_space_threshold : int; free_space_threshold : int;
## minimum amount of free disk space required to continue document filtering
free_space_threshold : int;
## default per-user disk quota ## default per-user disk quota
delete_quota_threshold : count; delete_quota_threshold : count;
## default per-user disk limit ## default per-user disk limit

12
src/Type.cc
View file

@ -1039,6 +1039,16 @@ void RecordType::AddField(unsigned int field, const TypeDecl* td)
ASSERT(field == field_inits.size()); ASSERT(field == field_inits.size());
ASSERT(field == managed_fields.size()); ASSERT(field == managed_fields.size());
if ( field_ids.count(td->id) != 0 )
{
reporter->Error("Duplicate field '%s' found in record definition\n", td->id);
return;
}
else
{
field_ids.insert(std::string(td->id));
}
managed_fields.push_back(ZVal::IsManagedType(td->type)); managed_fields.push_back(ZVal::IsManagedType(td->type));
auto init = new FieldInit(); auto init = new FieldInit();
@ -1106,7 +1116,7 @@ void RecordType::AddField(unsigned int field, const TypeDecl* td)
bool RecordType::HasField(const char* field) const bool RecordType::HasField(const char* field) const
{ {
return FieldOffset(field) >= 0; return field_ids.count(field) != 0;
} }
ValPtr RecordType::FieldDefault(int field) const ValPtr RecordType::FieldDefault(int field) const

1
src/Type.h
View file

@ -725,6 +725,7 @@ protected:
int num_orig_fields; int num_orig_fields;
type_decl_list* types; type_decl_list* types;
std::set<std::string> field_ids;
}; };
class FileType final : public Type class FileType final : public Type

3
testing/btest/Baseline/language.record-duplicate-fields/.stderr Normal file
View file

@ -0,0 +1,3 @@
### BTest baseline data generated by btest-diff. Do not edit. Use "btest -U/-u" to update. Requires BTest >= 0.63.
error in <...>/record-duplicate-fields.zeek, line 7: Duplicate field 'a' found in record definition

13
testing/btest/language/record-duplicate-fields.zeek Normal file
View file

@ -0,0 +1,13 @@
# @TEST-EXEC-FAIL: zeek -b %INPUT
# @TEST-EXEC: TEST_DIFF_CANONIFIER=$SCRIPTS/diff-remove-abspath btest-diff .stderr
type test: record {
a: count;
a: string &optional;
};
event zeek_init()
{
local a = test($a=5);
print a;
}