From 9596d0ddf067b6f819ab16916ae9337132cf721c Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 19 Sep 2001 03:25:37 +0000 Subject: Update. 2001-09-18 Ulrich Drepper * malloc/malloc.c (ptmalloc_init): Handle _environ==NULL. Reported by B. D. Elliott [PR libc/2541]. 2001-09-18 Andreas Schwab * elf/dl-load.c (_dl_map_object_from_fd): Update handling of scope list, now that l_scope is a pointer. * elf/dl-open.c (dl_open_worker): Fix thinko when enlarging the scope list. 2001-09-18 kaz Kojima * sysdeps/sh/dl-machine.h (elf_machine_rela): Fix reverse condition. (elf_machine_rela_relative): Add a missing declaration. 2001-09-18 Jakub Jelinek * sysdeps/unix/sysv/linux/ia64/ldd-rewrite.sed: New. * sysdeps/unix/sysv/linux/s390/ldd-rewrite.sed: New. * sysdeps/unix/sysv/linux/configure.in: Add ia64 and s390 ldd-rewrite scripts. 2001-09-18 Ulrich Drepper * elf/ldd.bash.in: Update copyright message. 2001-09-17 H.J. Lu * hurd/hurdmalloc.c (bcopy): Removed. (realloc): Replace bcopy with memcpy. * hurd/path-lookup.c (file_name_path_scan): Likewise. * resolv/gethnamaddr.c (map_v4v6_address): Likewise. * sunrpc/rpcinfo.c (pmapdump): Likewise. * resolv/gethnamaddr.c (getanswer): Replace bcopy with memmove. (gethostbyaddr): Likewise. * sunrpc/rpcinfo.c (get_inet_address): Likewise. 2001-09-18 Ulrich Drepper * sysdeps/gnu/eval.c: Removed. --- elf/dl-open.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'elf/dl-open.c') diff --git a/elf/dl-open.c b/elf/dl-open.c index f79c317da8..d10ab8ac65 100644 --- a/elf/dl-open.c +++ b/elf/dl-open.c @@ -312,7 +312,7 @@ dl_open_worker (void *a) ++runp; } - if (__builtin_expect (cnt + 1 < imap->l_scope_max, 0)) + if (__builtin_expect (cnt + 1 >= imap->l_scope_max, 0)) { /* The 'r_scope' array is too small. Allocate a new one dynamically. */ @@ -327,7 +327,7 @@ dl_open_worker (void *a) _dl_signal_error (ENOMEM, "dlopen", NULL, N_("cannot create scope list")); imap->l_scope = memcpy (newp, imap->l_scope, - cnt * imap->l_scope_max); + cnt * sizeof (imap->l_scope[0])); } else { @@ -339,10 +339,10 @@ dl_open_worker (void *a) N_("cannot create scope list")); imap->l_scope = newp; } - - imap->l_scope[cnt++] = &new->l_searchlist; - imap->l_scope[cnt] = NULL; } + + imap->l_scope[cnt++] = &new->l_searchlist; + imap->l_scope[cnt] = NULL; } /* Run the initializer functions of new objects. */ -- cgit 1.4.1