From: Alan Modra <amodra@gmail.com>
Date: Tue, 14 Oct 2014 03:00:57 +0000 (+1030)
Subject: Correct fscanf char field count
X-Git-Tag: binutils-2_25~143
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9495b2e66f772783eb89cfa755e1e09641fa44eb;p=external%2Fbinutils.git

Correct fscanf char field count

%<number>s as an fscanf format does not include the trailing NULL.
PATH_MAX does include the trailing NULL.

	PR 17453
	* readelf.c (process_program_headers): Correct fscanf format used
	for interpreter.
---

diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 34d65fc..b6800f1 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,9 @@
+2014-10-14  Alan Modra  <amodra@gmail.com>
+
+	PR 17453
+	* readelf.c (process_program_headers): Correct fscanf format used
+	for interpreter.
+
 2014-10-09  Jose E. Marchesi  <jose.marchesi@oracle.com>
 
 	* readelf.c (display_sparc_hwcaps2): New function.
@@ -287,8 +293,8 @@
 
 2014-03-14  Meador Inge  <meadori@codesourcery.com>
 
-         * dwarf.c (strnlen): Move prototype ...
-	 * sysdep.h (strnlen): ... to here.
+	* dwarf.c (strnlen): Move prototype ...
+	* sysdep.h (strnlen): ... to here.
 
 2014-03-12  Nick Clifton  <nickc@redhat.com>
 
diff --git a/binutils/readelf.c b/binutils/readelf.c
index 3cf46d8..58ccd93 100644
--- a/binutils/readelf.c
+++ b/binutils/readelf.c
@@ -4394,7 +4394,7 @@ process_program_headers (FILE * file)
 	  else
 	    {
 	      char fmt [32];
-	      int ret = snprintf (fmt, sizeof (fmt), "%%%ds", PATH_MAX);
+	      int ret = snprintf (fmt, sizeof (fmt), "%%%ds", PATH_MAX - 1);
 
 	      if (ret >= (int) sizeof (fmt) || ret < 0)
 		error (_("Internal error: failed to create format string to display program interpreter\n"));