Change a "while {}" loop to a "do {} while" to allow it to be

executed at least once, fixing pthread_mutex_lock() for recursive
mutex lock attempts.

Correctly set a threads signal mask while it is executing a signal
handler.  The mask should be the union of its current mask, the
signal being handled, and the mask from the signal action.

Reported by: Dan Nelson <dnelson@emsphone.com>

MFC Candidate

1 files changed, 4 insertions, 0 deletions

diff --git a/lib/libpthread/thread/thr_sig.c b/lib/libpthread/thread/thr_sig.c
index 3ac9740..a855a61 100644
--- a/lib/libpthread/thread/thr_sig.c
+++ b/lib/libpthread/thread/thr_sig.c
@@ -1057,6 +1057,10 @@ thread_sigframe_add(pthread_t thread, int sig, int has_args)
 		    sizeof(psf->siginfo));
 	}
 
+	/* Setup the signal mask: */
+	SIGSETOR(thread->sigmask, _thread_sigact[sig - 1].sa_mask);
+	sigaddset(&thread->sigmask, sig);
+
 	/* Set up the new frame: */
 	thread->curframe = psf;
 	thread->ctxtype = CTX_JB_NOSIG;