aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDJ Delorie <dj@redhat.com>2002-11-24 15:59:22 +0000
committerDJ Delorie <dj@redhat.com>2002-11-24 15:59:22 +0000
commit756954c3c911ad904623426b5631436511b95cca (patch)
tree1d90e3531c47daef1c3c86064729db7b97d84f09
parent931d12c681248b84b7e5b411ff8797288702ae87 (diff)
downloadgdb-756954c3c911ad904623426b5631436511b95cca.zip
gdb-756954c3c911ad904623426b5631436511b95cca.tar.gz
gdb-756954c3c911ad904623426b5631436511b95cca.tar.bz2
merge from gcc
-rw-r--r--libiberty/ChangeLog5
-rw-r--r--libiberty/make-relative-prefix.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index 57ff7da..c58dc1f 100644
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,8 @@
+2002-11-24 Nick Clifton <nickc@redhat.com>
+
+ * make-relative-prefix.c (make_relative_prefix): Ensure return
+ string is empty before using strcat to construct it.
+
2002-11-22 Daniel Jacobowitz <drow@mvista.com>
* Makefile.in: Add make-relative-prefix.c.
diff --git a/libiberty/make-relative-prefix.c b/libiberty/make-relative-prefix.c
index ae1ac54..ef9177e 100644
--- a/libiberty/make-relative-prefix.c
+++ b/libiberty/make-relative-prefix.c
@@ -362,6 +362,7 @@ make_relative_prefix (progname, bin_prefix, prefix)
return NULL;
/* Build up the pathnames in argv[0]. */
+ *ret = '\0';
for (i = 0; i < prog_num; i++)
strcat (ret, prog_dirs[i]);