From: Jakub Jelinek Date: Thu, 12 Jul 2007 15:09:50 +0000 (+0000) Subject: 2007-04-13 Jakub Jelinek X-Git-Tag: cvs/fedora-glibc-2_5-20070712T1701~38 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c9837f613823cdde9ff4786b38cc06c6ac65735;p=thirdparty%2Fglibc.git 2007-04-13 Jakub Jelinek [BZ #4344] * elf/ldconfig.c (search_dir): Fix 2 off-by-2 errors. Reported by David Anderson . --- diff --git a/ChangeLog b/ChangeLog index d7fbb6a01b2..998be3adfa6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-04-13 Jakub Jelinek + + [BZ #4344] + * elf/ldconfig.c (search_dir): Fix 2 off-by-2 errors. + Reported by David Anderson . + 2007-04-13 Jakub Jelinek * stdio-common/printf_fp.c (___printf_fp): Fix exponent -4 diff --git a/elf/ldconfig.c b/elf/ldconfig.c index 5b9a5b17445..7fdbe9da2cc 100644 --- a/elf/ldconfig.c +++ b/elf/ldconfig.c @@ -706,10 +706,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; @@ -717,10 +717,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);