aboutsummaryrefslogtreecommitdiff
path: root/elf/dl-load.c
diff options
context:
space:
mode:
Diffstat (limited to 'elf/dl-load.c')
-rw-r--r--elf/dl-load.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/elf/dl-load.c b/elf/dl-load.c
index bb1ad972d4..c48286f938 100644
--- a/elf/dl-load.c
+++ b/elf/dl-load.c
@@ -54,7 +54,7 @@ open_path (const char *name, size_t namelen,
const char *dirpath,
char **realname)
{
- char buf[strlen (dirpath) + 1 + namelen];
+ char *buf;
const char *p;
int fd;
@@ -65,6 +65,7 @@ open_path (const char *name, size_t namelen,
return -1;
}
+ buf = alloca (strlen (dirpath) + 1 + namelen);
do
{
dirpath = p;
@@ -166,7 +167,8 @@ _dl_map_object (struct link_map *loader, const char *name,
fd = -1;
if (loader && loader->l_info[DT_RPATH])
trypath ((const char *) (loader->l_addr +
- loader->l_info[DT_RPATH]->d_un.d_ptr));
+ loader->l_info[DT_STRTAB]->d_un.d_ptr +
+ loader->l_info[DT_RPATH]->d_un.d_val));
if (fd == -1 && ! _dl_secure)
trypath (getenv ("LD_LIBRARY_PATH"));
if (fd == -1)