From 854a4dc348025dc8044f1132e63561e4249a2f87 Mon Sep 17 00:00:00 2001 From: Peter Stephenson Date: Fri, 1 Aug 2003 09:57:32 +0000 Subject: 18916: unsetting IFS could cause segfault --- ChangeLog | 5 +++++ Src/utils.c | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6254fb00..3e28a6b5c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-08-01 Peter Stephenson + + * 18916: Src/utils.c: Unsetting IFS could cause segmentation + fault (any time IFS was used to join an array). + 2003-07-24 Oliver Kiddle * 18900: Completion/Linux/Command/_iptables, diff --git a/Src/utils.c b/Src/utils.c index 292f9cc89..4a6c1d3f6 100644 --- a/Src/utils.c +++ b/Src/utils.c @@ -2029,10 +2029,12 @@ sepjoin(char **s, char *sep, int heap) if (!*s) return heap ? "" : ztrdup(""); if (!sep) { - sep = sepbuf; - sepbuf[0] = *ifs; - sepbuf[1] = *ifs == Meta ? ifs[1] ^ 32 : '\0'; - sepbuf[2] = '\0'; + p = sep = sepbuf; + if (ifs) { + *p++ = *ifs; + *p++ = *ifs == Meta ? ifs[1] ^ 32 : '\0'; + } + *p = '\0'; } sl = strlen(sep); for (t = s, l = 1 - sl; *t; l += strlen(*t) + sl, t++); -- cgit 1.4.1