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

Merge 7c10b8639e into 8b4707a284

Browse source
This commit is contained in:
Tim Wojtulewicz 2025-09-30 23:12:16 +00:00 • committed by GitHub
commit 77d0d66a0c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Debug.cc
View file

@ -821,6 +821,10 @@ bool pre_execute_stmt(Stmt* stmt, Frame* f) {
}
bool post_execute_stmt(Stmt* stmt, Frame* f, Val* result, StmtFlowType* flow) {
// If the debugger isn't currently active, return true so the caller continues.
if ( ! g_policy_debug )
return true;
// Handle the case where someone issues a "next" debugger command,
// but we're at a return statement, so the next statement is in
// some other function.

9
src/Func.cc
View file

@ -339,7 +339,8 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
f->SetTriggerAssoc(parent->GetTriggerAssoc());
}
g_frame_stack.push_back(f.get()); // used for backtracing
if ( ! g_policy_debug )
g_frame_stack.push_back(f.get()); // used for backtracing
const CallExpr* call_expr = parent ? parent->GetCall() : nullptr;
call_stack.emplace_back(CallInfo{call_expr, this, *args});
@ -391,7 +392,8 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
catch ( InterpreterException& e ) {
// Already reported, but now determine whether to unwind further.
if ( Flavor() == FUNC_FLAVOR_FUNCTION ) {
g_frame_stack.pop_back();
if ( ! g_policy_debug )
g_frame_stack.pop_back();
call_stack.pop_back();
// Result not set b/c exception was thrown
throw;
@ -448,7 +450,8 @@ ValPtr ScriptFunc::Invoke(zeek::Args* args, Frame* parent) const {
g_trace_state.LogTrace("Function return: %s\n", d.Description());
}
g_frame_stack.pop_back();
if ( ! g_policy_debug )
g_frame_stack.pop_back();
return result;
}

6
src/Stmt.cc
View file

@ -147,8 +147,10 @@ const AssertStmt* Stmt::AsAssertStmt() const {
}
bool Stmt::SetLocationInfo(const Location* start, const Location* end) {
if ( ! Obj::SetLocationInfo(start, end) )
return false;
// Skip the rest of this code if the debugger isn't active or if the initial set
// failed.
if ( bool res = Obj::SetLocationInfo(start, end); ! res || ! detail::g_policy_debug )
return res;
// Update the Filemap of line number -> statement mapping for
// breakpoints (Debug.h).

6
src/zeek-setup.cc
View file

@ -1052,7 +1052,8 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
auto [body, scope] = get_global_stmts();
StmtFlowType flow;
Frame f(scope->Length(), nullptr, nullptr);
g_frame_stack.push_back(&f);
if ( ! g_policy_debug )
g_frame_stack.push_back(&f);
try {
body->Exec(&f, flow);
@ -1060,7 +1061,8 @@ SetupResult setup(int argc, char** argv, Options* zopts) {
reporter->FatalError("failed to execute script statements at top-level scope");
}
g_frame_stack.pop_back();
if ( ! g_policy_debug )
g_frame_stack.pop_back();
}
clear_script_analysis();