Restore previous sigmask in gdb.block_signals

Tom de Vries found a bug where, sometimes, a SIGCHLD would be
delivered to a non-main thread, wreaking havoc.

The problem is that gdb.block_signals after first blocking a set of
signals, then unblocked the same set rather than restoring the initial
situation.  This function being called from the DAP thread lead to
SIGCHLD being unblocked there.

This patch fixes the problem by restoring the previous set of signals
instead.

Tested-by: Tom de Vries <tdevries@suse.de>
Reviewed-By: Tom de Vries <tdevries@suse.de>
Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=30680

diff --git a/gdb/python/lib/gdb/__init__.py b/gdb/python/lib/gdb/__init__.py
index 98aadb1dfea7a37ff35680f44da662b8a2c7afd6..b3124369fe8765d2c2bc80eaa988571d9ee59e2b 100644 (file)
--- a/gdb/python/lib/gdb/__init__.py
+++ b/gdb/python/lib/gdb/__init__.py
@@ -271,11 +271,11 @@ def blocked_signals():
         return
 
     to_block = {signal.SIGCHLD, signal.SIGINT, signal.SIGALRM, signal.SIGWINCH}
-    signal.pthread_sigmask(signal.SIG_BLOCK, to_block)
+    old_mask = signal.pthread_sigmask(signal.SIG_BLOCK, to_block)
     try:
         yield None
     finally:
-        signal.pthread_sigmask(signal.SIG_UNBLOCK, to_block)
+        signal.pthread_sigmask(signal.SIG_SETMASK, old_mask)
 
 
 class Thread(threading.Thread):