fix bogus lazy allocation in ctermid and missing malloc failure check

[musl] / src / thread / cancellation.c

diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c
index 6dfee53..9b21764 100644 (file)
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,33 +1,20 @@
 #include "pthread_impl.h"
 
-#ifdef __pthread_register_cancel
-#undef __pthread_register_cancel
-#undef __pthread_unregister_cancel
-#undef __pthread_unwind_next
-#define __pthread_register_cancel __pthread_register_cancel_3
-#define __pthread_unregister_cancel __pthread_unregister_cancel_3
-#define __pthread_unwind_next __pthread_unwind_next_3
-#endif
-
 static void dummy(struct __ptcb *cb)
 {
 }
-weak_alias(dummy, __pthread_do_unwind);
-
-void __pthread_unwind_next(struct __ptcb *cb)
-{
-       __pthread_do_unwind(cb);
-}
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
 
-void __pthread_register_cancel(struct __ptcb *cb)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-       struct pthread *self = pthread_self();
-       cb->__next = self->cancelbuf;
-       self->cancelbuf = cb;
+       cb->__f = f;
+       cb->__x = x;
+       __do_cleanup_push(cb);
 }
 
-void __pthread_unregister_cancel(struct __ptcb *cb)
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
-       struct pthread *self = __pthread_self();
-       self->cancelbuf = self->cancelbuf->__next;
+       __do_cleanup_pop(cb);
+       if (run) cb->__f(cb->__x);
 }