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 9c5eb404543719704816c274dc44cfb39927eb2a..0747409a899a96cfa6151bd0e886c97e5e890dc5 100644 (file)
--- 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 8c6363808ee4e793742fdaf9148a67e63787bcd9..f5cb3eeb71862fb428f9347e50cabe204f49a58f 100644 (file)
--- 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);
                        }