diff options
| author | Corinna Vinschen <vinschen@redhat.com> | 2008-02-14 14:23:51 +0000 |
|---|---|---|
| committer | Corinna Vinschen <vinschen@redhat.com> | 2008-02-14 14:23:51 +0000 |
| commit | 69a10b127727c274be899b08ddc994f794af27f7 (patch) | |
| tree | 67dccf3e68460a092554e63b00d411d02f0833d3 | |
| parent | dc54d58651f6c589e0ab8b38f2380352ee3ab380 (diff) | |
| download | gdb-69a10b127727c274be899b08ddc994f794af27f7.tar.gz | |
* thread.cc (pthread_kill): Deal with signal 0 as per POSIX and also
avoid manipulating an invalid thread.
| -rw-r--r-- | winsup/cygwin/ChangeLog | 5 | ||||
| -rw-r--r-- | winsup/cygwin/thread.cc | 20 |
2 files changed, 23 insertions, 2 deletions
diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index 66da517b136..8494c2218bf 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2008-02-13 Christopher Faylor <me+cygwin@cgf.cx> + + * thread.cc (pthread_kill): Deal with signal 0 as per POSIX and also + avoid manipulating an invalid thread. + 2008-02-13 Corinna Vinschen <corinna@vinschen.de> * cygtls.cc (_cygtls::init_exception_handler): Revert patch diff --git a/winsup/cygwin/thread.cc b/winsup/cygwin/thread.cc index 73bb9b142f6..f5226a55275 100644 --- a/winsup/cygwin/thread.cc +++ b/winsup/cygwin/thread.cc @@ -2811,8 +2811,24 @@ pthread_kill (pthread_t thread, int sig) si.si_code = SI_USER; si.si_pid = myself->pid; si.si_uid = myself->uid; - thread->cygtls->set_threadkill (); - int rval = sig ? sig_send (NULL, si, thread->cygtls) : 0; + int rval; + if (!thread->valid) + rval = ESRCH; + else if (sig) + { + thread->cygtls->set_threadkill (); + rval = sig_send (NULL, si, thread->cygtls); + } + else + switch (WaitForSingleObject (thread->win32_obj_id, 0)) + { + case WAIT_TIMEOUT: + rval = 0; + break; + default: + rval = ESRCH; + break; + } // unlock myself return rval; |