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/awelzel/event-trace-fix-operator-equals'

Browse source 
* origin/topic/awelzel/event-trace-fix-operator-equals:
  EventTrace: Fix operator==() UBSAN downcast error
This commit is contained in:
Tim Wojtulewicz 2025-05-19 12:32:56 -07:00
commit ddeecabc1e
3 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
CHANGES
View file

@ -1,3 +1,11 @@
8.0.0-dev.142 | 2025-05-19 12:32:56 -0700
* EventTrace: Fix operator==() UBSAN downcast error (Arne Welzel, Corelight)
New test triggered the following error:
runtime error: downcast of address 0x57021a323ea0 which does not point to an object of type 'const FileVal' 0x57021a323ea0: note: object is of type 'zeek::FuncVal'
8.0.0-dev.140 | 2025-05-19 11:04:29 -0700 8.0.0-dev.140 | 2025-05-19 11:04:29 -0700
* Change from_json to return an error rather than print it. (Steve Smoot, Corelight) * Change from_json to return an error rather than print it. (Steve Smoot, Corelight)

2
VERSION
View file

@ -1 +1 @@
8.0.0-dev.140 8.0.0-dev.142

2
src/EventTrace.cc
View file

@ -95,7 +95,7 @@ bool ValTrace::operator==(const ValTrace& vt) const {
case TYPE_SUBNET: return v->AsSubNet() == vt_v->AsSubNet(); case TYPE_SUBNET: return v->AsSubNet() == vt_v->AsSubNet();
case TYPE_FUNC: return v->AsFile() == vt_v->AsFile(); case TYPE_FUNC: return v->AsFunc() == vt_v->AsFunc();
case TYPE_FILE: return v->AsFile() == vt_v->AsFile(); case TYPE_FILE: return v->AsFile() == vt_v->AsFile();