From e3234d01094d9ed62e90c6d52a44601dce93a1bb Mon Sep 17 00:00:00 2001 From: Rich Felker Date: Tue, 28 Feb 2012 10:13:35 -0500 Subject: [PATCH] fix pthread_cleanup_pop(1) crash in non-thread-capable, static-linked programs --- src/thread/cancellation.c | 2 ++ src/thread/pthread_create.c | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/thread/cancellation.c b/src/thread/cancellation.c index 23d23d14..ab7eebcc 100644 --- a/src/thread/cancellation.c +++ b/src/thread/cancellation.c @@ -5,6 +5,8 @@ void __do_cleanup_pop(); void _pthread_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x) { + cb->__f = f; + cb->__x = x; __do_cleanup_push(cb, f, x); } diff --git a/src/thread/pthread_create.c b/src/thread/pthread_create.c index d84e50a9..0e1dbb2d 100644 --- a/src/thread/pthread_create.c +++ b/src/thread/pthread_create.c @@ -46,8 +46,6 @@ void pthread_exit(void *result) void __do_cleanup_push(struct __ptcb *cb, void (*f)(void *), void *x) { struct pthread *self = pthread_self(); - cb->__f = f; - cb->__x = x; cb->__next = self->cancelbuf; self->cancelbuf = cb; } -- 2.20.1