From 38e7bb0fb1c53d4ddf7b333eb242839e4d226e28 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 21 Mar 2025 10:30:18 +0100 Subject: catch_unwind: do not permit catch function to unwind --- src/tools/miri/src/shims/panic.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/miri/src/shims/panic.rs b/src/tools/miri/src/shims/panic.rs index fc58d88591f..18af8214876 100644 --- a/src/tools/miri/src/shims/panic.rs +++ b/src/tools/miri/src/shims/panic.rs @@ -144,7 +144,8 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> { // Directly return to caller of `try`. StackPopCleanup::Goto { ret: catch_unwind.ret, - unwind: mir::UnwindAction::Continue, + // `catch_fn` must not unwind. + unwind: mir::UnwindAction::Unreachable, }, )?; -- cgit 1.4.1-3-g733a5