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

Merge remote-tracking branch 'origin/topic/johanna/global_frame_stack'

Browse source 
Additionally changed to pop call_stack which tracks related data.

* origin/topic/johanna/global_frame_stack:
  Pop global frame stack on exception.
This commit is contained in:
Jon Siwek 2020-02-26 19:51:24 -08:00
commit 36557f3086
3 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Func.cc
View file

@ -395,6 +395,8 @@ Val* BroFunc::Call(val_list* args, Frame* parent) const
// Already reported, but now determine whether to unwind further.
if ( Flavor() == FUNC_FLAVOR_FUNCTION )
{
g_frame_stack.pop_back();
call_stack.pop_back();
Unref(f);
// Result not set b/c exception was thrown
throw;