ntdll: Fix NtContinue from within exception context on ARM64.

When handling an exception, NtContinue can be called from within the signal handler, in which case the raise(SIGUSR2) call ends up getting eaten and integer register context never ends up getting restored. Switch to the method used on X86 to avoid these issues.

ntdll: Fix NtContinue from within exception context on ARM64.
88e33621 · Billy Laws · Alexandre Julliard · ab296a30 · 88e33621
Commit 88e33621 authored Jul 11, 2023 by Billy Laws Committed by Alexandre Julliard Jul 12, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

signal_arm64.c dlls/ntdll/unix/signal_arm64.c +2 -1

No files found.
--- a/dlls/ntdll/unix/signal_arm64.c
+++ b/dlls/ntdll/unix/signal_arm64.c
@@ -569,7 +569,8 @@ NTSTATUS signal_set_full_context( CONTEXT *context )
 {
    NTSTATUS status = NtSetContextThread( GetCurrentThread(), context );

-    if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER) raise( SIGUSR2 );
+    if (!status && (context->ContextFlags & CONTEXT_INTEGER) == CONTEXT_INTEGER)
+        arm64_thread_data()->syscall_frame->restore_flags |= CONTEXT_INTEGER;
    return status;
 }