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

Merge remote-tracking branch 'origin/topic/jsiwek/fix-enumtype-shallow-clone'

Browse source 
* origin/topic/jsiwek/fix-enumtype-shallow-clone:
  Fix ref-counting bug in EnumType copy ctor
This commit is contained in:
Robin Sommer 2019-07-16 15:21:37 +00:00
commit a45cc53892
5 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
CHANGES
View file

@ -1,4 +1,11 @@
2.6-616 | 2019-07-16 15:21:37 +0000
* Fix referecne counting bug in EnumType copy constructor. (Jon
Siwek, Corelight)
* Remove unused BroObj::in_ser_cache member. (Jon Siwek, Corelight)
2.6-612 | 2019-07-15 19:46:04 -0700 2.6-612 | 2019-07-15 19:46:04 -0700
* Fix a potential usage of List::remove_nth(-1) (Jon Siwek, Corelight) * Fix a potential usage of List::remove_nth(-1) (Jon Siwek, Corelight)

2
VERSION
View file

@ -1 +1 @@
2.6-612 2.6-616

3
src/Type.cc
View file

@ -1088,6 +1088,9 @@ EnumType::EnumType(const EnumType* e)
names[it->first] = it->second; names[it->first] = it->second;
vals = e->vals; vals = e->vals;
for ( auto& kv : vals )
::Ref(kv.second);
} }
EnumType* EnumType::ShallowClone() EnumType* EnumType::ShallowClone()

1
testing/btest/Baseline/language.enum-multiple-decls/out Normal file
View file

@ -0,0 +1 @@
ONE

10
testing/btest/language/enum-multiple-decls.zeek Normal file
View file

@ -0,0 +1,10 @@
# @TEST-EXEC: zeek -b %INPUT >out
# @TEST-EXEC: btest-diff out
# At the moment, it's legal to allow a double definitions. Internally, the
# reason/comment is: "so that we can define an enum both in a *.bif and *.zeek
# for avoiding cyclic dependencies."
type myenum: enum { ONE = 0x01 };
type myenum: enum { ONE = 0x01 };
print ONE;