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

Merge remote-tracking branch 'origin/topic/jsiwek/gh-1062-fix-tag-subtypes'

Browse source 
* origin/topic/jsiwek/gh-1062-fix-tag-subtypes:
  GH-1062: fix integer conversion errors related to Tag subtypes
This commit is contained in:
Jon Siwek 2020-07-14 19:10:36 -07:00
commit fd8db24daf
5 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,4 +1,8 @@
3.2.0-dev.902 | 2020-07-14 19:10:36 -0700
* GH-1062: fix integer conversion errors related to Tag subtypes (Jon Siwek, Corelight)
3.2.0-dev.899 | 2020-07-14 00:02:05 +0000 3.2.0-dev.899 | 2020-07-14 00:02:05 +0000
* Improve Broker store API's handling of invalid arguments * Improve Broker store API's handling of invalid arguments

2
VERSION
View file

@ -1 +1 @@
3.2.0-dev.899 3.2.0-dev.902

2
src/Val.h
View file

@ -1254,7 +1254,7 @@ protected:
template<class T, class... Ts> template<class T, class... Ts>
friend zeek::IntrusivePtr<T> zeek::make_intrusive(Ts&&... args); friend zeek::IntrusivePtr<T> zeek::make_intrusive(Ts&&... args);
EnumVal(zeek::EnumTypePtr t, int i) : Val(bro_int_t(i), std::move(t)) EnumVal(zeek::EnumTypePtr t, bro_int_t i) : Val(i, std::move(t))
{} {}
void ValDescribe(ODesc* d) const override; void ValDescribe(ODesc* d) const override;

3
src/parse.y
View file

@ -692,8 +692,7 @@ expr:
else if ( id->IsEnumConst() ) else if ( id->IsEnumConst() )
{ {
zeek::EnumType* t = id->GetType()->AsEnumType(); zeek::EnumType* t = id->GetType()->AsEnumType();
int intval = t->Lookup(id->ModuleName(), auto intval = t->Lookup(id->ModuleName(), id->Name());
id->Name());
if ( intval < 0 ) if ( intval < 0 )
reporter->InternalError("enum value not found for %s", id->Name()); reporter->InternalError("enum value not found for %s", id->Name());
$$ = new zeek::detail::ConstExpr(t->GetVal(intval)); $$ = new zeek::detail::ConstExpr(t->GetVal(intval));

2
testing/btest/plugins/protocol-plugin/src/Plugin.cc
View file

@ -10,7 +10,7 @@ using namespace plugin::Demo_Foo;
plugin::Configuration Plugin::Configure() plugin::Configuration Plugin::Configure()
{ {
AddComponent(new ::analyzer::Component("Foo", plugin::Demo_Foo::Foo::Instantiate)); AddComponent(new ::analyzer::Component("Foo", plugin::Demo_Foo::Foo::Instantiate, 1));
plugin::Configuration config; plugin::Configuration config;
config.name = "Demo::Foo"; config.name = "Demo::Foo";