emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ash: do not split the result of tilde expansion

Browse Source 
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>
This commit is contained in:
Ron Yorston
2015-03-16 14:14:11 +00:00
committed by Denys Vlasenko
parent 6798564b9e
commit 75a76269ba
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
shell/ash.c
View File

@@ -5791,7 +5791,6 @@ exptilde(char *startp, char *p, int flags)
struct passwd *pw; struct passwd *pw;
const char *home; const char *home;
int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR); int quotes = flags & (EXP_FULL | EXP_CASE | EXP_REDIR);
int startloc;
name = p + 1; name = p + 1;
@@ -5823,9 +5822,7 @@ exptilde(char *startp, char *p, int flags)
if (!home || !*home) if (!home || !*home)
goto lose; goto lose;
*p = c; *p = c;
startloc = expdest - (char *)stackblock();
strtodest(home, SQSYNTAX, quotes); strtodest(home, SQSYNTAX, quotes);
recordregion(startloc, expdest - (char *)stackblock(), 0);
return p; return p;
lose: lose:
*p = c; *p = c;