Skip to content

Commit

Permalink
ircd::m::vm: Fix propagation of faults to evaluator as expected by op…
Browse files Browse the repository at this point in the history
…ts mask.
  • Loading branch information
jevolk committed Jan 18, 2023
1 parent a2b7c17 commit 336f740
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions matrix/vm_execute.cc
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ ircd::m::vm::execute(eval &eval,
0UL
};

for(k = 0; k < j; ++k, ++eval.evaluated) try
for(k = 0; k < j; ++k, ++eval.evaluated)
{
const bool exists
(
Expand Down Expand Up @@ -282,21 +282,6 @@ ircd::m::vm::execute(eval &eval,
if(likely(fault == fault::ACCEPT || exists))
handle_fault(opts, fault, event.event_id?: eval.event_id, string_view{});
}
catch(const ctx::interrupted &)
{
++eval.faulted;
throw;
}
catch(const std::exception &)
{
++eval.faulted;
continue;
}
catch(...)
{
++eval.faulted;
throw;
}
}

return fault::ACCEPT;
Expand Down

0 comments on commit 336f740

Please sign in to comment.