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 967705a..9b21764 100644 (file)
--- a/src/thread/cancellation.c
+++ b/src/thread/cancellation.c
@@ -1,20 +1,20 @@
 #include "pthread_impl.h"
 
-void __do_cleanup_push();
-void __do_cleanup_pop();
-
-void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
+static void dummy(struct __ptcb *cb)
 {
-       __do_cleanup_push(cb, f, x);
 }
+weak_alias(dummy, __do_cleanup_push);
+weak_alias(dummy, __do_cleanup_pop);
 
-void _pthread_cleanup_pop(struct __ptcb *cb, int run)
+void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x)
 {
-       __do_cleanup_pop(cb, run);
+       cb->__f = f;
+       cb->__x = x;
+       __do_cleanup_push(cb);
 }
 
-static void dummy()
+void _pthread_cleanup_pop(struct __ptcb *cb, int run)
 {
+       __do_cleanup_pop(cb);
+       if (run) cb->__f(cb->__x);
 }
-weak_alias(dummy, __do_cleanup_push);
-weak_alias(dummy, __do_cleanup_pop);