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

GH-1534: Fix excessive coredump for duplicate enum definitions

Browse source 
An adequate error message was previously reported for duplicate enum
definitions, this just now prevents trying to access it as a constant in
subsequent parsing and further generating a coredump.
This commit is contained in:
Jon Siwek 2021-04-29 15:20:09 -07:00
parent af3814792a
commit 13f3cb377f
3 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/parse.y
View file

@ -769,6 +769,13 @@ expr:
else if ( id->IsEnumConst() ) else if ( id->IsEnumConst() )
{ {
if ( IsErrorType(id->GetType()->Tag()) )
{
// The most-relevant error message should already be reported, so
// just bail out.
YYERROR;
}
EnumType* t = id->GetType()->AsEnumType(); EnumType* t = id->GetType()->AsEnumType();
auto intval = t->Lookup(id->ModuleName(), id->Name()); auto intval = t->Lookup(id->ModuleName(), id->Name());
if ( intval < 0 ) if ( intval < 0 )

1
testing/btest/Baseline/language.enum-name-conflict/output
View file

@ -4,3 +4,4 @@ error in <...>/enum-name-conflict.zeek, line 15 and <...>/enum-name-conflict.zee
error in <...>/enum-name-conflict.zeek, line 27 and <...>/enum-name-conflict.zeek, line 23: conflicting definition of enum value 'Foo::TWO' in type 'Foo::bf' error in <...>/enum-name-conflict.zeek, line 27 and <...>/enum-name-conflict.zeek, line 23: conflicting definition of enum value 'Foo::TWO' in type 'Foo::bf'
error in <...>/enum-name-conflict.zeek, line 32 and <...>/enum-name-conflict.zeek, line 22: conflicting definition of enum value 'Foo::ONE' in type 'Foo::bf' error in <...>/enum-name-conflict.zeek, line 32 and <...>/enum-name-conflict.zeek, line 22: conflicting definition of enum value 'Foo::ONE' in type 'Foo::bf'
error in <...>/enum-name-conflict.zeek, line 41 and <...>/enum-name-conflict.zeek, line 38: conflicting definition of enum value 'NOPE' in type 'a' error in <...>/enum-name-conflict.zeek, line 41 and <...>/enum-name-conflict.zeek, line 38: conflicting definition of enum value 'NOPE' in type 'a'
error in <...>/enum-name-conflict.zeek, line 46 and <...>/enum-name-conflict.zeek, line 45: conflicting definition of enum value 'Pink' in type 'E'

7
testing/btest/language/enum-name-conflict.zeek
View file

@ -40,3 +40,10 @@ global NOPE = 37;
redef enum a += { redef enum a += {
NOPE, NOPE,
}; };
type E: enum { Red, Green, Blue };
redef enum E += { Pink };
redef enum E += { Pink };
print Pink;
print Pink;