aboutsummaryrefslogtreecommitdiff
path: root/shell
diff options
context:
space:
mode:
authorGravatar Ron Yorston <rmy@tigress.co.uk>2015-03-16 14:14:11 +0000
committerGravatar Denys Vlasenko <vda.linux@googlemail.com>2015-03-22 16:55:44 +0100
commit75a76269ba2549cb5392d7d720a4c393de01b934 (patch)
tree59c0b0029589482d8fb96b7067f4e4d95542eb09 /shell
parent6798564b9e2f1a81b8c2d0cb4add97cb736d982b (diff)
downloadbusybox-75a76269ba2549cb5392d7d720a4c393de01b934.tar.gz
busybox-75a76269ba2549cb5392d7d720a4c393de01b934.tar.bz2
ash: do not split the result of tilde expansion
A tilde expansion generates a valid pathname. Splitting it using IFS either leaves it unchanged or changes it to something unintended. Example: IFS=m HOME=/tmp; printf "%s\n" ~ Based on this commit authored by Jilles Tjoelker: http://git.kernel.org/cgit/utils/dash/dash.git/commit/?id=834629283f6c629a4da05ef60bae9445c954a19a Signed-off-by: Ron Yorston <rmy@tigress.co.uk> Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'shell')
-rw-r--r--shell/ash.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 0f9f73ec3..b568013b4 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -5791,7 +5791,6 @@ exptilde(char *startp, char *p, int flags)
struct passwd *pw;
const char *home;
int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
- int startloc;
name = p + 1;
@@ -5823,9 +5822,7 @@ exptilde(char *startp, char *p, int flags)
if (!home || !*home)
goto lose;
*p = c;
- startloc = expdest - (char *)stackblock();
strtodest(home, SQSYNTAX, quotes);
- recordregion(startloc, expdest - (char *)stackblock(), 0);
return p;
lose:
*p = c;