From 1fb4ce83f409539da74d994f5a37ed839ef6e9c0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Storsj=C3=B6?= Date: Mon, 15 Nov 2021 16:02:09 +0200 Subject: [PATCH] ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes unwinding from functions ending with a call to a function that won't return. This matches what is done on the PE side in the call to lookup_function_info. Signed-off-by: Martin Storsjö Signed-off-by: Alexandre Julliard --- dlls/ntdll/unix/signal_arm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/signal_arm.c b/dlls/ntdll/unix/signal_arm.c index 2017cf150db..ebc08984adf 100644 --- a/dlls/ntdll/unix/signal_arm.c +++ b/dlls/ntdll/unix/signal_arm.c @@ -229,7 +229,7 @@ extern void raise_func_trampoline( EXCEPTION_RECORD *rec, CONTEXT *context, void NTSTATUS CDECL unwind_builtin_dll( ULONG type, struct _DISPATCHER_CONTEXT *dispatch, CONTEXT *context ) { #ifdef HAVE_LIBUNWIND - DWORD ip = context->Pc; + DWORD ip = context->Pc - (dispatch->ControlPcIsUnwound ? 2 : 0); unw_context_t unw_context; unw_cursor_t cursor; unw_proc_info_t info; -- 2.11.4.GIT