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

Fix for CIDs 1402823 and 1394050.

Browse source 
An InterpreterException from clone framing could go uncaught.
This commit is contained in:
Robin Sommer 2019-09-20 07:55:09 +00:00
parent 0a2d84284c
commit c38e9b2ff2
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Trigger.cc
View file

@ -218,7 +218,21 @@ bool Trigger::Eval()
// An alternative approach to copying the frame would be to deep-copy
// the expression itself, replacing all references to locals with
// constants.
Frame* f = frame->Clone();
Frame* f = nullptr;
try
{
f = frame->Clone();
}
catch ( InterpreterException& )
{
// Frame contains values that couldn't be cloned. It's
// already been reported, disable trigger.
Disable();
return false;
}
f->SetTrigger(this);
Val* v = nullptr;