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

simplified "assert" by not trying to catch messages that themselves have errors

Browse source
This commit is contained in:
Vern Paxson 2024-12-02 10:37:10 -08:00
parent a2a47ba334
commit 05e913db1b
6 changed files with 17 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Stmt.cc
View file

@ -1597,23 +1597,11 @@ ValPtr AssertStmt::Exec(Frame* f, StmtFlowType& flow) {
if ( ! assert_result || run_result_hook ) {
zeek::StringValPtr msg_val = zeek::val_mgr->EmptyString();
if ( msg ) {
// Eval() may fail if expression assumes assert
// condition is F, but we still try to get it for
// the assertion_result hook.
try {
msg_val = cast_intrusive<zeek::StringVal>(msg->Eval(f));
} catch ( InterpreterException& e ) {
static ODesc desc;
desc.Clear();
desc.SetShort(true);
desc.SetQuotes(true);
desc.Add("<error eval ");
msg->Describe(&desc);
desc.Add(">");
msg_val = zeek::make_intrusive<zeek::StringVal>(desc.Len(), (const char*)desc.Bytes());
}
}
if ( msg )
// It's up to the script writing to assure that the expression
// works regardless of the state of the condition. If they
// fail to do so, they can get an exception at this point.
msg_val = cast_intrusive<zeek::StringVal>(msg->Eval(f));
report_assert(assert_result, cond_desc, msg_val, GetLocationInfo());
}