diff options
Diffstat (limited to 'elf')
| -rw-r--r-- | elf/dl-object.c | 15 | ||||
| -rw-r--r-- | elf/rtld.c | 13 |
2 files changed, 19 insertions, 9 deletions
diff --git a/elf/dl-object.c b/elf/dl-object.c index 0488e3230c..398628aa1b 100644 --- a/elf/dl-object.c +++ b/elf/dl-object.c @@ -150,15 +150,18 @@ _dl_new_object (char *realname, const char *libname, int type, } /* Add the real file name. */ - memcpy (cp, realname, realname_len); + cp = __mempcpy (cp, realname, realname_len); - /* Now remove the filename and the slash. Leave the slash if it + /* Now remove the filename and the slash. Leave the slash if the name is something like "/foo". */ - cp = strrchr (origin, '/'); + do + --cp; + while (*cp != '/'); + if (cp == origin) - origin[1] = '\0'; - else - *cp = '\0'; + /* Keep the only slash which is the first character. */ + ++cp; + *cp = '\0'; out: new->l_origin = origin; diff --git a/elf/rtld.c b/elf/rtld.c index 1efe38bc80..b835bd5dda 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -589,10 +589,17 @@ of this helper program; chances are you did not intend to run this program.\n\ be our SONAME, and add it to our name list. */ if (GL(dl_rtld_map).l_ld == NULL) { - char *p = strrchr (_dl_rtld_libname.name, '/'); - if (p) + const char *p = NULL; + const char *cp = _dl_rtld_libname.name; + + /* Find the filename part of the path. */ + while (*cp != '\0') + if (*cp++ == '/') + p = cp; + + if (p != NULL) { - _dl_rtld_libname2.name = p+1; + _dl_rtld_libname2.name = p; /* _dl_rtld_libname2.next = NULL; Already zero. */ _dl_rtld_libname.next = &_dl_rtld_libname2; } |