diff options
| author | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-12 11:45:28 +0000 |
|---|---|---|
| committer | Peter Stephenson <pws@users.sourceforge.net> | 2003-05-12 11:45:28 +0000 |
| commit | 8ee83d44ff765a87380c50c52979a37e8e856b5d (patch) | |
| tree | 985bfc6718c739a8a9e944bcc619368d36eeca4b | |
| parent | 860764b30ab91e6af1ee98d26eaa622b215df948 (diff) | |
| download | zsh-8ee83d44ff765a87380c50c52979a37e8e856b5d.tar.gz zsh-8ee83d44ff765a87380c50c52979a37e8e856b5d.tar.xz zsh-8ee83d44ff765a87380c50c52979a37e8e856b5d.zip | |
18524: sepjoin !heap bug cause problem in vared
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Src/utils.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 4f5e47a87..19940b460 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-12 Oliver Kiddle <opk@zsh.org> * 18520, 13691 (Mario Lang), 13701 (Sven): diff --git a/Src/utils.c b/Src/utils.c index 92d97bc5c..05ef32844 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2050,7 +2050,7 @@ sepjoin(char **s, char *sep, int heap) char sepbuf[3]; if (!*s) - return ""; + return heap ? "" : ztrdup(""); if (!sep) { sep = sepbuf; sepbuf[0] = *ifs; |