about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Stephenson <pws@users.sourceforge.net>2003-05-12 11:46:34 +0000
committerPeter Stephenson <pws@users.sourceforge.net>2003-05-12 11:46:34 +0000
commitfa09beea011a6d5727f917d84dd55bd9f86e5f28 (patch)
tree322c3f9797ea7514f41f0f0bffade10d6b0db65e
parent11cd9b2de3b8ce3a73260673c5571fecbc95318f (diff)
downloadzsh-fa09beea011a6d5727f917d84dd55bd9f86e5f28.tar.gz
zsh-fa09beea011a6d5727f917d84dd55bd9f86e5f28.tar.xz
zsh-fa09beea011a6d5727f917d84dd55bd9f86e5f28.zip
18524: sepjoin !heap bug cause problem in vared
-rw-r--r--ChangeLog5
-rw-r--r--Src/utils.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e1e8a4ac..9bdb15849 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-12  Peter Stephenson  <pws@csr.com>
+
+	* 18524: Src/utils.c: sepjoin didn't respect !heap for an empty
+	array.  Showed up when vared'ing a zero-length array.
+
 2003-05-08  Peter Stephenson  <pws@csr.com>
 
 	* 18512 (modified for 4.0): README, Completion/Unix/Command/_cvs,
diff --git a/Src/utils.c b/Src/utils.c
index aa2a3738b..292f9cc89 100644
--- a/Src/utils.c
+++ b/Src/utils.c
@@ -2027,7 +2027,7 @@ sepjoin(char **s, char *sep, int heap)
     char sepbuf[3];
 
     if (!*s)
-	return "";
+	return heap ? "" : ztrdup("");
     if (!sep) {
 	sep = sepbuf;
 	sepbuf[0] = *ifs;