diff options
| author | Ron Yorston | 2015-03-16 14:14:11 +0000 |
|---|---|---|
| committer | Denys Vlasenko | 2015-03-22 16:55:44 +0100 |
| commit | 75a76269ba2549cb5392d7d720a4c393de01b934 (patch) | |
| tree | 59c0b0029589482d8fb96b7067f4e4d95542eb09 /shell | |
| parent | 6798564b9e2f1a81b8c2d0cb4add97cb736d982b (diff) | |
| download | busybox-75a76269ba2549cb5392d7d720a4c393de01b934.zip busybox-75a76269ba2549cb5392d7d720a4c393de01b934.tar.gz | |
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.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/shell/ash.c b/shell/ash.c index 0f9f73e..b568013 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; |