X-Git-Url: http://nsz.repo.hu/git/?p=musl;a=blobdiff_plain;f=src%2Fthread%2Fcancel_impl.c;fp=src%2Fthread%2Fcancel_impl.c;h=2d2bb572553117d1483f05f4d6d565d688851a44;hp=7bcfaef5dbd82bafa744646bbd2768e15783684b;hb=09dae2b7b66f741b30aa7ce95ab395239da20762;hpb=ebf82447be4b30bedc19ad868c3a0662b1ba596d diff --git a/src/thread/cancel_impl.c b/src/thread/cancel_impl.c index 7bcfaef5..2d2bb572 100644 --- a/src/thread/cancel_impl.c +++ b/src/thread/cancel_impl.c @@ -3,6 +3,7 @@ void __cancel() { pthread_t self = __pthread_self(); + self->cp_sp = 0; self->canceldisable = 1; self->cancelasync = 0; pthread_exit(PTHREAD_CANCELED); @@ -24,8 +25,8 @@ long (__syscall_cp)(long nr, long u, long v, long w, long x, long y, long z) self->cp_sp = 0; self->cp_ip = 0; r = __syscall_cp_asm(&self->cp_sp, nr, u, v, w, x, y, z); - self->cp_sp = old_sp; self->cp_ip = old_ip; + self->cp_sp = old_sp; if (r == -EINTR && self->cancel) __cancel(); return r; }