about summary refs log tree commit diff
path: root/sysdeps/posix/system.c
diff options
context:
space:
mode:
Diffstat (limited to 'sysdeps/posix/system.c')
-rw-r--r--sysdeps/posix/system.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sysdeps/posix/system.c b/sysdeps/posix/system.c
index d8c6cb8e1c..6de85bd3e4 100644
--- a/sysdeps/posix/system.c
+++ b/sysdeps/posix/system.c
@@ -81,7 +81,11 @@ cancel_handler (void *arg)
 
   __kill_noerrno (args->pid, SIGKILL);
 
-  TEMP_FAILURE_RETRY (__waitpid_nocancel (args->pid, NULL, 0));
+  int state;
+  __libc_ptf_call (__pthread_setcancelstate,
+                   (PTHREAD_CANCEL_DISABLE, &state), 0);
+  TEMP_FAILURE_RETRY (__waitpid (args->pid, NULL, 0));
+  __libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
 
   DO_LOCK ();
   if (SUB_REF () == 0)