OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ldconfig: don't crash on empty path in config file

This commit is contained in:
Andreas Schwab 2011-05-03 13:44:25 -04:00 committed by Ulrich Drepper
parent 1bfbe0d335
commit 00ee369c1c
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-05-03 Andreas Schwab <schwab@redhat.com>
* elf/ldconfig.c (add_dir): Don't crash on empty path.
2011-04-28 Maciej Babinski <mbabinski@google.com>
[BZ #12714]

15
elf/ldconfig.c
View File

@ -384,14 +384,17 @@ add_dir (const char *line)
}
/* Canonify path: for now only remove leading and trailing
whitespace and the trailing slashes slashes. */
i = strlen (entry->path) - 1;
whitespace and the trailing slashes. */
i = strlen (entry->path);
while (isspace (entry->path[i]) && i > 0)
entry->path[i--] = '\0';
while (i > 0 && isspace (entry->path[i - 1]))
entry->path[--i] = '\0';
while (entry->path[i] == '/' && i > 0)
entry->path[i--] = '\0';
while (i > 0 && entry->path[i - 1] == '/')
entry->path[--i] = '\0';
if (i == 0)
return;
char *path = entry->path;
if (opt_chroot)