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

Merge remote-tracking branch 'origin/topic/christian/fix-config-segfault'

Browse source 
* origin/topic/christian/fix-config-segfault:
  Btest tweak for improved type rendering in config framework errors and set types
  More precise type information in a config framework error message
  Explicitly don't support sets with multiple index types in input/config frameworks
This commit is contained in:
Johanna Amann 2021-01-21 11:27:14 +00:00
commit 079d4164c0
7 changed files with 49 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/input/Manager.cc
View file

@ -832,7 +832,12 @@ bool Manager::IsCompatibleType(Type* t, bool atomic_only)
if ( ! t->IsSet() )
return false;
return IsCompatibleType(t->AsSetType()->GetIndices()->GetPureType().get(), true);
const auto& indices = t->AsSetType()->GetIndices();
if ( indices->GetTypes().size() != 1 )
return false;
return IsCompatibleType(indices->GetPureType().get(), true);
}
case TYPE_VECTOR: