diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-12-18 17:32:37 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-12-18 17:32:37 +0000 |
| commit | a3c88553729c1c4dcd4f893a96b4668bce640ee5 (patch) | |
| tree | d6660a25aa0a3a8b86fccfe2efbd2155e0893e97 /stdlib/on_exit.c | |
| parent | 3467f5c369a10ef19c8df38fb282c7763f36d66f (diff) | |
| download | glibc-a3c88553729c1c4dcd4f893a96b4668bce640ee5.tar.gz glibc-a3c88553729c1c4dcd4f893a96b4668bce640ee5.tar.xz glibc-a3c88553729c1c4dcd4f893a96b4668bce640ee5.zip | |
* stdlib/cxa_atexit.c: Use PTR_MANGLE on function pointer. Fill in
flavor field last and protect with memory barrier. * stdlib/on_exit.c: Likewise. * stdlib/cxa_finalize.c: Use PTR_DEMANGLE on function pointer before using it. * stdlib/exit.c: Likewise.
Diffstat (limited to 'stdlib/on_exit.c')
| -rw-r--r-- | stdlib/on_exit.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/stdlib/on_exit.c b/stdlib/on_exit.c index d98fbb3a86..e777604084 100644 --- a/stdlib/on_exit.c +++ b/stdlib/on_exit.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1996 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1996, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -18,6 +18,8 @@ #include <stdlib.h> #include "exit.h" +#include <atomic.h> +#include <sysdep.h> /* Register a function to be called by exit. */ int @@ -28,9 +30,13 @@ __on_exit (void (*func) (int status, void *arg), void *arg) if (new == NULL) return -1; - new->flavor = ef_on; +#ifdef PTR_MANGLE + PTR_MANGLE (func); +#endif new->func.on.fn = func; new->func.on.arg = arg; + atomic_write_barrier (); + new->flavor = ef_on; return 0; } weak_alias (__on_exit, on_exit) |