aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-object.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2008-07-26 08:42:54 +0000
committerUlrich Drepper <drepper@redhat.com>2008-07-26 08:42:54 +0000
commitff0bf75374401cd3a726d209198dca4af272b1c2 (patch)
tree7acb04059fc30aefb6a89284c02b818ccb350175 /elf/dl-object.c
parentbdd24a302efff7f6e7df9a0accbc382a12d803ff (diff)
downloadglibc-ff0bf75374401cd3a726d209198dca4af272b1c2.tar
glibc-ff0bf75374401cd3a726d209198dca4af272b1c2.tar.gz
glibc-ff0bf75374401cd3a726d209198dca4af272b1c2.tar.bz2
glibc-ff0bf75374401cd3a726d209198dca4af272b1c2.zip
* sunrpc/clnt_udp.c (__libc_clntudp_bufcreate): Namespace cleanup.
* elf/dl-load.c (local_strdup): Remove inline. (_dl_map_object_from_fd): Don't allocate l_symbolic_searchlist.r_list. * elf/dl-object.c (_dl_new_object): Allocate symbolic searchlist as part of the object. * sysdeps/unix/sysv/linux/dl-origin.c: Add const to avoid warning.
Diffstat (limited to 'elf/dl-object.c')
-rw-r--r--elf/dl-object.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/elf/dl-object.c b/elf/dl-object.c
index 0e45aea39b..7780de6304 100644
--- a/elf/dl-object.c
+++ b/elf/dl-object.c
@@ -50,13 +50,17 @@ _dl_new_object (char *realname, const char *libname, int type,
#endif
new = (struct link_map *) calloc (sizeof (*new) + audit_space
+ + sizeof (struct r_scope_elem)
+ sizeof (*newname) + libname_len, 1);
if (new == NULL)
return NULL;
new->l_real = new;
- new->l_libname = newname = (struct libname_list *) ((char *) (new + 1)
- + audit_space);
+ new->l_symbolic_searchlist.r_list = (struct link_map **) ((char *) (new + 1)
+ + audit_space);
+
+ new->l_libname = newname
+ = (struct libname_list *) (new->l_symbolic_searchlist.r_list + 1);
newname->name = (char *) memcpy (newname + 1, libname, libname_len);
/* newname->next = NULL; We use calloc therefore not necessary. */
newname->dont_free = 1;