diff options
| author | Rich Felker <dalias@aerifal.cx> | 2012-02-28 10:13:35 -0500 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2012-02-28 10:13:35 -0500 |
| commit | e3234d01094d9ed62e90c6d52a44601dce93a1bb (patch) | |
| tree | 86434e96d663b6cece01dcaa5af4e30769db7972 | |
| parent | aab33ec0a3c46ee82ef849a4c6308c9ccf7529bc (diff) | |
| download | musl-e3234d01094d9ed62e90c6d52a44601dce93a1bb.tar.gz musl-e3234d01094d9ed62e90c6d52a44601dce93a1bb.tar.xz musl-e3234d01094d9ed62e90c6d52a44601dce93a1bb.zip | |
fix pthread_cleanup_pop(1) crash in non-thread-capable, static-linked programs
| -rw-r--r-- | src/thread/cancellation.c | 2 | ||||
| -rw-r--r-- | 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; } |