2006-10-29 H.J. Lu <hongjiu.lu@intel.com>

	PR binutils/3384
	* configure.in (AC_CHECK_HEADERS): Add limits.h and sys/param.h.
	* configure: Regenerated.
	* config.in: Likewise.

	* readelf.c: Include <limits.h> and <sys/param.h> for PATH_MAX.
	(program_interpreter): Allocate PATH_MAX bytes instead of 64.
	(process_program_headers): Don't assume that program interpreter
	is shorter than 64 characters.

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index d82cd78a5dcb50a941c738c67754adbb4ff974be..7b935d91f65df82d9324dd87a9cdf17be18d0977 100644 (file)
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,15 @@
+2006-10-29  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR binutils/3384
+       * configure.in (AC_CHECK_HEADERS): Add limits.h and sys/param.h.
+       * configure: Regenerated.
+       * config.in: Likewise.
+
+       * readelf.c: Include <limits.h> and <sys/param.h> for PATH_MAX.
+       (program_interpreter): Allocate PATH_MAX bytes instead of 64.
+       (process_program_headers): Don't assume that program interpreter
+       is shorter than 64 characters.
+
 2006-10-25  Trevor Smigiel  <Trevor_Smigiel@playstation.sony.com>
            Yukishige Shibata  <shibata@rd.scei.sony.co.jp>
            Nobuhisa Fujinami  <fnami@rd.scei.sony.co.jp>

diff --git a/binutils/configure b/binutils/configure
index 83e632d1540753d0e509c5587dfb7d378619d683..412483013bcaba95e2439741f1a66cbcf6edcc05 100755 (executable)
--- a/binutils/configure
+++ b/binutils/configure
@@ -6425,7 +6425,9 @@ done
 
 
 
-for ac_header in string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h
+
+
+for ac_header in string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
 if eval "test \"\${$as_ac_Header+set}\" = set"; then

diff --git a/binutils/configure.in b/binutils/configure.in
index 7b63f4dccc94d665241fa19df6099f49d9eb95c2..f2f3db8d74c05fa41317632f464354e0a3906b59 100644 (file)
--- a/binutils/configure.in
+++ b/binutils/configure.in
@@ -80,7 +80,7 @@ case "${host}" in
 esac
 AC_SUBST(DEMANGLER_NAME)
 
-AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h)
+AC_CHECK_HEADERS(string.h strings.h stdlib.h unistd.h fcntl.h sys/file.h limits.h sys/param.h)
 AC_HEADER_SYS_WAIT
 AC_FUNC_ALLOCA
 AC_CHECK_FUNCS(sbrk utimes setmode getc_unlocked strcoll)

diff --git a/binutils/readelf.c b/binutils/readelf.c
index 04490fe70c3d2c02c1601beaa983a13ba332c16b..9e015e24f83a2131f36283e6ca95ee5f03d452bf 100644 (file)
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -47,6 +47,25 @@
 #include <stdio.h>
 #include <time.h>
 
+/* for PATH_MAX */
+#ifdef HAVE_LIMITS_H
+#include <limits.h>
+#endif
+
+#ifndef PATH_MAX
+/* for MAXPATHLEN */
+# ifdef HAVE_SYS_PARAM_H
+#  include <sys/param.h>
+# endif
+# ifndef PATH_MAX
+#  ifdef MAXPATHLEN
+#   define PATH_MAX MAXPATHLEN
+#  else
+#   define PATH_MAX 1024
+#  endif
+# endif
+#endif
+
 #if __GNUC__ >= 2
 /* Define BFD64 here, even if our default architecture is 32 bit ELF
    as this will allow us to read in and parse 64bit and 32bit ELF files.
@@ -135,7 +154,7 @@ static Elf_Internal_Sym *dynamic_symbols;
 static Elf_Internal_Syminfo *dynamic_syminfo;
 static unsigned long dynamic_syminfo_offset;
 static unsigned int dynamic_syminfo_nent;
-static char program_interpreter[64];
+static char program_interpreter[PATH_MAX];
 static bfd_vma dynamic_info[DT_JMPREL + 1];
 static bfd_vma dynamic_info_DT_GNU_HASH;
 static bfd_vma version_info[16];
@@ -3492,8 +3511,14 @@ process_program_headers (FILE *file)
            error (_("Unable to find program interpreter name\n"));
          else
            {
+             char fmt [32];
+             int ret = snprintf (fmt, sizeof (fmt), "%%%ds", PATH_MAX);
+
+             if (ret >= (int) sizeof (fmt) || ret < 0)
+               error (_("Internal error: failed to create format string to display program interpreter"));
+
              program_interpreter[0] = 0;
-             fscanf (file, "%63s", program_interpreter);
+             fscanf (file, fmt, program_interpreter);
 
              if (do_segments)
                printf (_("\n      [Requesting program interpreter: %s]"),