about summary refs log tree commit diff
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2012-01-22 17:19:37 -0500
committerRich Felker <dalias@aerifal.cx>2012-01-22 17:19:37 -0500
commitce7d72596c57386c493969cc56546c7aba2e1049 (patch)
tree1ea4fe7ef5e3f313cad1ce20fc1cbfd8719fb92c
parent787c2648a9bdc9431237abc0fdd61971cbf289cd (diff)
downloadmusl-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.
-rw-r--r--src/thread/cancel_impl.c2
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;