From: Nick Clifton <nickc@redhat.com>
Date: Thu, 24 Nov 2016 10:00:20 +0000 (+0000)
Subject: Fix snafu parsing $ORIGIN.
X-Git-Tag: users/ARM/embedded-binutils-master-2016q4~129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=51750acd087cc20ae3f72393fa897d9e3059c65d;p=external%2Fbinutils.git

Fix snafu parsing $ORIGIN.

	PR ld/20858
	* emultempl/elf32.em (_search_needed): Allow for path separator
	and terminating NUL byte when allocating space for new $ORIGIN
	path.
---

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 9c5eb40..0747409 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2016-11-24  Nick Clifton  <nickc@redhat.com>
+
+	PR ld/20858
+	* emultempl/elf32.em (_search_needed): Allow for path separator
+	and terminating NUL byte when allocating space for new $ORIGIN
+	path.
+
 2016-11-23  Nick Clifton  <nickc@redhat.com>
 
 	* testsuite/ld-arm/vxworks2.sd: Update expected readelf output.
diff --git a/ld/emultempl/elf32.em b/ld/emultempl/elf32.em
index 8c63638..f5cb3ee 100644
--- a/ld/emultempl/elf32.em
+++ b/ld/emultempl/elf32.em
@@ -585,7 +585,7 @@ gld${EMULATION_NAME}_search_needed (const char *path,
 			{
 			  char * current_dir = getpwd ();
 
-			  freeme = xmalloc (strlen (replacement) + strlen (current_dir));
+			  freeme = xmalloc (strlen (replacement) + strlen (current_dir) + 2);
 			  sprintf (freeme, "%s/%s", current_dir, replacement);
 			}