diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-01-22 17:19:37 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-01-22 17:19:37 -0500 |
| commit | ce7d72596c57386c493969cc56546c7aba2e1049 (patch) | |
| tree | 1ea4fe7ef5e3f313cad1ce20fc1cbfd8719fb92c /src | |
| parent | 787c2648a9bdc9431237abc0fdd61971cbf289cd (diff) | |
| download | musl-ce7d72596c57386c493969cc56546c7aba2e1049.tar.gz musl-ce7d72596c57386c493969cc56546c7aba2e1049.tar.xz musl-ce7d72596c57386c493969cc56546c7aba2e1049.zip | |
fix cancellation failure in single-threaded programs
even a single-threaded program can be cancellable, e.g. if it's called pthread_cancel(pthread_self()). the correct predicate to check is not whether multiple threads have been invoked, but whether pthread_self has been invoked.
Diffstat (limited to 'src')
| -rw-r--r-- | src/thread/cancel_impl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c index cf5082d3..7652a7c9 100644 --- a/src/thread/cancel_impl.c +++ b/src/thread/cancel_impl.c @@ -17,7 +17,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z) uintptr_t old_sp, old_ip; long r; - if (!libc.threaded || (self = __pthread_self())->canceldisable) + if (!libc.main_thread || (self = __pthread_self())->canceldisable) return __syscall(nr, u, v, w, x, y, z); old_sp = self->cp_sp; |