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

fixes for a number of ZAM optimization bugs

Browse source
This commit is contained in:
Vern Paxson 2023-11-05 16:26:38 -08:00 • committed by Arne Welzel
parent 9bfe18473d
commit 1dc74eaa9c
11 changed files with 44 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/zeek-setup.cc
View file

@ -923,7 +923,7 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
exit(reporter->Errors() != 0);
}
auto init_stmts = stmts ? analyze_global_stmts(stmts) : nullptr;
auto init_stmts_handle = stmts ? analyze_global_stmts(stmts) : 0;
analyze_scripts(options.no_unused_warnings);
@ -1025,13 +1025,14 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
// cause more severe problems.
ZEEK_LSAN_ENABLE();
if ( init_stmts ) {
if ( stmts ) {
auto& init_stmts = get_global_stmts(init_stmts_handle);
StmtFlowType flow;
Frame f(init_stmts->Scope()->Length(), nullptr, nullptr);
Frame f(init_stmts.Scope()->Length(), nullptr, nullptr);
g_frame_stack.push_back(&f);
try {
init_stmts->Body()->Exec(&f, flow);
init_stmts.Body()->Exec(&f, flow);
} catch ( InterpreterException& ) {
reporter->FatalError("failed to execute script statements at top-level scope");
}