diff options
author | Ulrich Drepper <drepper@redhat.com> | 2000-07-13 19:46:27 +0000 |
---|---|---|
committer | Ulrich Drepper <drepper@redhat.com> | 2000-07-13 19:46:27 +0000 |
commit | ca3c01356495ebfbb315c2984dda8eba88467597 (patch) | |
tree | 1a39c90278b0888a0f10ab83526912c977bcbc81 /elf/dl-libc.c | |
parent | aa4068f2945ff0b263d9fc6342c39767bf723327 (diff) | |
download | glibc-ca3c01356495ebfbb315c2984dda8eba88467597.tar glibc-ca3c01356495ebfbb315c2984dda8eba88467597.tar.gz glibc-ca3c01356495ebfbb315c2984dda8eba88467597.tar.bz2 glibc-ca3c01356495ebfbb315c2984dda8eba88467597.zip |
Update.
* elf/Versions (ld): Export _dl_out_of_memory for GLIBC_2.2.
* dlfcn/dlerror.c (dlerror): Don't free the error string if it is the
report that we are out of memory.
* elf/dl-deps.c (_dl_map_object_deps): Likewise.
* elf/dl-libc.c (dlerror_run): Likewise.
* elf/dl-open.c (_dl_open): Likewise.
* elf/rtld.c (dl_main): Likewise.
* elf/dl-error.c: Define _dl_out_of_memory.
(_dl_signal_error): Return _dl_signal_error if we cannot duplicate
the error string.
* sysdeps/generic/ldsodefs.h: Declare _dl_out_of_memory.
* dlfcn/dlerror.c (free_key_mem): Also free error string.
* iconv/loop.c: Fix comment.
Diffstat (limited to 'elf/dl-libc.c')
-rw-r--r-- | elf/dl-libc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/elf/dl-libc.c b/elf/dl-libc.c index 38774e50a0..992a52e699 100644 --- a/elf/dl-libc.c +++ b/elf/dl-libc.c @@ -42,7 +42,7 @@ dlerror_run (void (*operate) (void *), void *args) (void) _dl_catch_error (&objname, &last_errstring, operate, args); result = last_errstring != NULL; - if (result) + if (result && last_errstring != _dl_out_of_memory) free ((char *) last_errstring); return result; |