about summary refs log tree commit diff
path: root/src/thread/pthread_setcancelstate.c
diff options
context:
space:
mode:
authorRich Felker <dalias@aerifal.cx>2011-04-20 21:41:45 -0400
committerRich Felker <dalias@aerifal.cx>2011-04-20 21:41:45 -0400
commit870cc679771f776333953b2a990a107393d9d0fd (patch)
tree45b6de4ba1170de4654b23d62bd1c6a38220e112 /src/thread/pthread_setcancelstate.c
parentf9a6372a98cc4d1b70400b2e7238e1f9eae50558 (diff)
downloadmusl-870cc679771f776333953b2a990a107393d9d0fd.tar.gz
musl-870cc679771f776333953b2a990a107393d9d0fd.tar.xz
musl-870cc679771f776333953b2a990a107393d9d0fd.zip
fix minor bugs due to incorrect threaded-predicate semantics
some functions that should have been testing whether pthread_self()
had been called and initialized the thread pointer were instead
testing whether pthread_create() had been called and actually made the
program "threaded". while it's unlikely any mismatch would occur in
real-world problems, this could have introduced subtle bugs. now, we
store the address of the main thread's thread descriptor in the libc
structure and use its presence as a flag that the thread register is
initialized. note that after fork, the calling thread (not necessarily
the original main thread) is the new main thread.
Diffstat (limited to 'src/thread/pthread_setcancelstate.c')
-rw-r--r--src/thread/pthread_setcancelstate.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/thread/pthread_setcancelstate.c b/src/thread/pthread_setcancelstate.c
index ebb6eba4..ba2b2311 100644
--- a/src/thread/pthread_setcancelstate.c
+++ b/src/thread/pthread_setcancelstate.c
@@ -3,7 +3,7 @@
 int pthread_setcancelstate(int new, int *old)
 {
 	if (new > 1U) return EINVAL;
-	if (libc.threaded) {
+	if (libc.main_thread) {
 		struct pthread *self = __pthread_self();
 		if (old) *old = self->canceldisable;
 		self->canceldisable = new;