diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/expand.c | 7 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 44e5bdf..5163479 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2011-03-15 Jonathan Nieder <jrnieder@gmail.com> + + * Free IFS state after here document expansion. + 2011-03-15 Harald van Dijk <harald@gigawatt.nl> * Let funcnode refer to a function definition, not its first command. diff --git a/src/expand.c b/src/expand.c index f155ea0..ce60fe9 100644 --- a/src/expand.c +++ b/src/expand.c @@ -194,7 +194,8 @@ expandarg(union node *arg, struct arglist *arglist, int flag) p = _STPUTC('\0', expdest); expdest = p - 1; if (arglist == NULL) { - return; /* here document expanded */ + /* here document expanded */ + goto out; } p = grabstackstr(p); exparg.lastp = &exparg.list; @@ -212,12 +213,14 @@ expandarg(union node *arg, struct arglist *arglist, int flag) *exparg.lastp = sp; exparg.lastp = &sp->next; } - ifsfree(); *exparg.lastp = NULL; if (exparg.list) { *arglist->lastp = exparg.list; arglist->lastp = exparg.lastp; } + +out: + ifsfree(); } |