From 7951ede1dbb756aa3d6e81ee05fd9a63138066a1 Mon Sep 17 00:00:00 2001 From: dana Date: Sun, 30 Dec 2018 03:42:07 -0600 Subject: unposted (per 43938): Avoid segfault when unmetafying empty string --- ChangeLog | 5 +++++ Src/utils.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 2e37557df..61702caa8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2018-12-30 dana + + * unposted (per 43938): Src/utils.c: Avoid segfault when + unmetafying empty string + 2018-12-29 dana * 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 != ' ') { -- cgit 1.4.1