diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2005-06-12 16:29:51 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2005-06-12 16:29:51 +0000 |
| commit | 74780cf659d1e5cd91e82b6e5314dcfc7bba033b (patch) | |
| tree | d71a5f1c94a7b7ac1a117760f2f3bd45ab1eea1d /elf/dl-libc.c | |
| parent | 6dffebd8b4ef0e3310ac97cade0d5dc33c49dadc (diff) | |
| download | glibc-74780cf659d1e5cd91e82b6e5314dcfc7bba033b.tar glibc-74780cf659d1e5cd91e82b6e5314dcfc7bba033b.tar.gz glibc-74780cf659d1e5cd91e82b6e5314dcfc7bba033b.tar.bz2 glibc-74780cf659d1e5cd91e82b6e5314dcfc7bba033b.zip | |
* elf/dl-error.c (_dl_signal_error): Store information about use of
real malloc in the catch object.
(_dl_catch_error): Forward information about malloc use to caller
in new parameter.
(_dl_out_of_memory): Make static.
* elf/dl-deps.c: Adjust callers of _dl_catch_error.
* elf/dl-libc.c: Likewise.
* elf/dl-open.c: Likewise.
* elf/rtld.c: Likewise.
Add new --audit option.
* sysdeps/generic/ldsodefs.h: Remove _dl_out_of_memory declaration.
(rtld_global_ro._dl_signal_error): Add new parameter.
* include/dlfcn.h (_dl_catch_error): Add new parameter.
* dlfcn/dlfcn.c (_dlerror_run): Pass additional parameter to
_dl_catch_error. Only free if the returned newly value says so.
Diffstat (limited to 'elf/dl-libc.c')
| -rw-r--r-- | elf/dl-libc.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 5e76069139..1b995eda92 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -1,5 +1,5 @@ /* Handle loading and unloading shared objects for internal libc purposes. - Copyright (C) 1999, 2000, 2001, 2002, 2004 Free Software Foundation, Inc. + Copyright (C) 1999,2000,2001,2002,2004,2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Zack Weinberg <zack@rabi.columbia.edu>, 1999. @@ -42,12 +42,13 @@ dlerror_run (void (*operate) (void *), void *args) { const char *objname; const char *last_errstring = NULL; - int result; + bool malloced; - (void) GLRO(dl_catch_error) (&objname, &last_errstring, operate, args); + (void) GLRO(dl_catch_error) (&objname, &last_errstring, &malloced, + operate, args); - result = last_errstring != NULL; - if (result && last_errstring != _dl_out_of_memory) + int result = last_errstring != NULL; + if (result && malloced) free ((char *) last_errstring); return result; |