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 branch 'topic/christian/enumval-string-fix'

Browse source 
* topic/christian/enumval-string-fix:
  Bugfix: AsString() on an EnumVal will segfault
This commit is contained in:
Christian Kreibich 2025-06-11 09:00:46 -07:00
commit 62442058e7
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
CHANGES
View file

@ -1,3 +1,7 @@
8.0.0-dev.419 | 2025-06-11 09:00:46 -0700
* Bugfix: AsString() on an EnumVal will segfault (Christian Kreibich, Corelight)
8.0.0-dev.417 | 2025-06-11 17:24:11 +0200 8.0.0-dev.417 | 2025-06-11 17:24:11 +0200
* GH-4522: smtp: Fix last_reply column in smtp.log for BDAT LAST (Arne Welzel, Corelight) * GH-4522: smtp: Fix last_reply column in smtp.log for BDAT LAST (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.417 8.0.0-dev.419

6
src/plugin/ComponentManager.h
View file

@ -267,7 +267,8 @@ const std::string& ComponentManager<C>::GetComponentName(EnumValPtr val) const {
if ( C* c = Lookup(val.get()) ) if ( C* c = Lookup(val.get()) )
return c->CanonicalName(); return c->CanonicalName();
reporter->InternalWarning("requested name of unknown component tag %s", val->AsString()->CheckString()); reporter->InternalWarning("requested name of unknown component tag %s",
val->GetType()->AsEnumType()->Lookup(val->Get()));
return error; return error;
} }
@ -295,7 +296,8 @@ StringValPtr ComponentManager<C>::GetComponentNameVal(EnumValPtr val) const {
if ( C* c = Lookup(val.get()) ) if ( C* c = Lookup(val.get()) )
return c->CanonicalNameVal(); return c->CanonicalNameVal();
reporter->InternalWarning("requested name of unknown component tag %s", val->AsString()->CheckString()); reporter->InternalWarning("requested name of unknown component tag %s",
val->GetType()->AsEnumType()->Lookup(val->Get()));
return error; return error;
} }