aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2012-12-11 13:54:18 +0000
committerRon Yorston <rmy@pobox.com>2012-12-11 13:54:18 +0000
commitaf379094877a07180919b57af8df8d4f580967ab (patch)
treeb33428d37e8e76b08330dd8fb099b647f7dd83cf /shell
parent494dc899fd1b3b5fbac1c47bc5a604aed99654c8 (diff)
parent4d5955e9ece64e273e72c303983199be73022fab (diff)
downloadbusybox-w32-af379094877a07180919b57af8df8d4f580967ab.tar.gz
busybox-w32-af379094877a07180919b57af8df8d4f580967ab.tar.bz2
busybox-w32-af379094877a07180919b57af8df8d4f580967ab.zip
Merge branch 'busybox' into merge
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 5c33bb817..7a50e73f3 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9101,6 +9101,8 @@ expredir(union node *n)
9101#if ENABLE_ASH_BASH_COMPAT 9101#if ENABLE_ASH_BASH_COMPAT
9102 store_expfname: 9102 store_expfname:
9103#endif 9103#endif
9104 if (redir->nfile.expfname)
9105 stunalloc(redir->nfile.expfname);
9104 redir->nfile.expfname = fn.list->text; 9106 redir->nfile.expfname = fn.list->text;
9105 break; 9107 break;
9106 case NFROMFD: 9108 case NFROMFD: