summaryrefslogtreecommitdiff
path: root/elf/ldconfig.c
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2007-04-16 23:59:09 +0000
committerJakub Jelinek <jakub@redhat.com>2007-04-16 23:59:09 +0000
commite220c524c93b053a1dea504a2d18288ff8f32b9a (patch)
tree4193293c838a7db46f2cc0c2b50cb8601dcddb8d /elf/ldconfig.c
parenta891c7b0e014df5df027249f59cb444b87afdf30 (diff)
Updated to fedora-glibc-20070416T2350cvs/fedora-glibc-2_5_90-21
Diffstat (limited to 'elf/ldconfig.c')
-rw-r--r--elf/ldconfig.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/elf/ldconfig.c b/elf/ldconfig.c
index cb3b6c3b65..1aa8376b65 100644
--- a/elf/ldconfig.c
+++ b/elf/ldconfig.c
@@ -707,10 +707,10 @@ search_dir (const struct dir_entry *entry)
+ 1, ".#prelink#.", sizeof (".#prelink#.") - 1) == 0)
continue;
}
- len += strlen (entry->path);
+ len += strlen (entry->path) + 2;
if (len > file_name_len)
{
- file_name_len = len + 1;
+ file_name_len = len;
file_name = alloca (file_name_len);
if (!opt_chroot)
real_file_name = file_name;
@@ -718,10 +718,10 @@ search_dir (const struct dir_entry *entry)
sprintf (file_name, "%s/%s", entry->path, direntry->d_name);
if (opt_chroot)
{
- len = strlen (dir_name) + strlen (direntry->d_name);
+ len = strlen (dir_name) + strlen (direntry->d_name) + 2;
if (len > real_file_name_len)
{
- real_file_name_len = len + 1;
+ real_file_name_len = len;
real_file_name = alloca (real_file_name_len);
}
sprintf (real_file_name, "%s/%s", dir_name, direntry->d_name);