AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-09 23:00:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanups in ldconfig's chroot handling

Browse Source
This commit is contained in:
Ulrich Drepper 2011-10-29 12:43:18 -04:00
parent 1bc3307181
commit d272e7f19d
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2011-10-29 Ulrich Drepper <drepper@gmail.com>
* elf/chroot_canon.c (chroot_canon): Cleanups.
* elf/dl-lookup.c (_dl_setup_hash): Avoid warning.
[BZ #13335]

5
elf/chroot_canon.c
View File

@ -70,7 +70,6 @@ chroot_canon (const char *chroot, const char *name)
for (start = end = name; *start; start = end)
{
struct stat64 st;
int n;
/* Skip sequence of multiple path-separators. */
while (*start == '/')
@ -135,7 +134,7 @@ chroot_canon (const char *chroot, const char *name)
goto error;
}
n = readlink (rpath, buf, PATH_MAX - 1);
ssize_t n = readlink (rpath, buf, PATH_MAX - 1);
if (n < 0)
{
if (*end == '\0')
@ -148,7 +147,7 @@ chroot_canon (const char *chroot, const char *name)
extra_buf = alloca (PATH_MAX);
len = strlen (end);
if ((long int) (n + len) >= PATH_MAX)
if (len >= PATH_MAX - n)
{
__set_errno (ENAMETOOLONG);
goto error;