diff options
| author | dana <dana@dana.is> | 2018-12-30 03:42:07 -0600 |
|---|---|---|
| committer | dana <dana@dana.is> | 2018-12-30 03:42:07 -0600 |
| commit | 7951ede1dbb756aa3d6e81ee05fd9a63138066a1 (patch) | |
| tree | 14157a2bc4471a6cceefea20bbe2583f5f100d51 | |
| parent | 162c198aabcdbe3795d34142c4707649f60fe499 (diff) | |
| download | zsh-7951ede1dbb756aa3d6e81ee05fd9a63138066a1.tar.gz zsh-7951ede1dbb756aa3d6e81ee05fd9a63138066a1.tar.xz zsh-7951ede1dbb756aa3d6e81ee05fd9a63138066a1.zip | |
unposted (per 43938): Avoid segfault when unmetafying empty string
| -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 2e37557df..61702caa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-12-30 dana <dana@dana.is> + + * unposted (per 43938): Src/utils.c: Avoid segfault when + unmetafying empty string + 2018-12-29 dana <dana@dana.is> * 43953 (tweaked per 43954): Src/utils.c, Test/V09datetime.ztst: diff --git a/Src/utils.c b/Src/utils.c index 0969cef37..32f600858 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -3846,7 +3846,7 @@ sepjoin(char **s, char *sep, int heap) char sepbuf[2]; if (!*s) - return heap ? "" : ztrdup(""); + return heap ? dupstring("") : ztrdup(""); if (!sep) { /* optimise common case that ifs[0] is space */ if (ifs && *ifs != ' ') { |