[PATCH 2/2] ntdll: Subtract an offset from pc if dispatch->ControlPcIsUnwound on arm
Martin Storsjö
martin at martin.st
Mon Nov 15 08:02:09 CST 2021
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ö <martin at martin.st>
---
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.25.1
More information about the wine-devel
mailing list