Jacek Caban : ntdll: Block signals in send_debug_event.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 137fd7d3a0df17aa6c0dc3e40809eae341e12ba8
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=137fd7d3a0df17aa6c0dc3e40809eae341e12ba8

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Wed Apr 15 14:55:39 2020 +0200

ntdll: Block signals in send_debug_event.

Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/ntdll/exception.c | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/dlls/ntdll/exception.c b/dlls/ntdll/exception.c
index 589ceab390..a9ac24e44d 100644
--- a/dlls/ntdll/exception.c
+++ b/dlls/ntdll/exception.c
@@ -133,9 +133,12 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con
     client_ptr_t params[EXCEPTION_MAXIMUM_PARAMETERS];
     context_t server_context;
     select_op_t select_op;
+    sigset_t old_set;
 
     if (!NtCurrentTeb()->Peb->BeingDebugged) return 0;  /* no debugger present */
 
+    pthread_sigmask( SIG_BLOCK, &server_block_set, &old_set );
+
     for (i = 0; i < min( rec->NumberParameters, EXCEPTION_MAXIMUM_PARAMETERS ); i++)
         params[i] = rec->ExceptionInformation[i];
 
@@ -151,23 +154,27 @@ NTSTATUS send_debug_event( EXCEPTION_RECORD *rec, int first_chance, CONTEXT *con
         req->len     = i * sizeof(params[0]);
         wine_server_add_data( req, params, req->len );
         wine_server_add_data( req, &server_context, sizeof(server_context) );
-        if (!wine_server_call( req )) handle = reply->handle;
+        if (!(ret = wine_server_call( req ))) handle = reply->handle;
     }
     SERVER_END_REQ;
-    if (!handle) return 0;
-
-    select_op.wait.op = SELECT_WAIT;
-    select_op.wait.handles[0] = handle;
-    server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL );
 
-    SERVER_START_REQ( get_exception_status )
+    if (handle)
     {
-        req->handle = handle;
-        wine_server_set_reply( req, &server_context, sizeof(server_context) );
-        ret = wine_server_call( req );
+        select_op.wait.op = SELECT_WAIT;
+        select_op.wait.handles[0] = handle;
+        server_select( &select_op, offsetof( select_op_t, wait.handles[1] ), SELECT_INTERRUPTIBLE, TIMEOUT_INFINITE, NULL, NULL );
+
+        SERVER_START_REQ( get_exception_status )
+        {
+            req->handle = handle;
+            wine_server_set_reply( req, &server_context, sizeof(server_context) );
+            ret = wine_server_call( req );
+        }
+        SERVER_END_REQ;
+        if (ret >= 0) context_from_server( context, &server_context );
     }
-    SERVER_END_REQ;
-    if (ret >= 0) context_from_server( context, &server_context );
+
+    pthread_sigmask( SIG_SETMASK, &old_set, NULL );
     return ret;
 }