X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=src%2Fthread%2Fcancel_impl.c;h=0d80885f1959afdc5c9b908deccfa0232a97c8ed;hb=34d81974d341e0174d1fc690b4d3e3b9b1767586;hp=1f4ff90c2b095d4f1fca0e32f0102365513b4ff6;hpb=9080cc153cc2b09881c3245becbd68534db18d7c;p=musl

diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c
index 1f4ff90c..0d80885f 100644
--- a/src/thread/cancel_impl.c
+++ b/src/thread/cancel_impl.c
@@ -27,7 +27,7 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z)
 	r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z);
 	self->cp_ip = old_ip;
 	self->cp_sp = old_sp;
-	if (r == -EINTR && self->cancel) __cancel();
+	if (r == -EINTR && self->cancel && !self->canceldisable) __cancel();
 	return r;
 }