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

ash: eval: Use the correct expansion mode for fd redirection

Browse Source 
Upstream comment:

    Date: Mon, 19 Nov 2018 18:00:32 +0800
    eval: Use the correct expansion mode for fd redirection

    It has been reported that

            echo test >&$EMPTY_VARIABLE

    causes dash to segfault.  This is a symptom of the bigger problem
    that dash tries to perform pathname expansion as well as field
    splitting on the word after >& and <&.  This is wrong and this
    patch fixes it to use the same expansions as done on a normal
    redirection.

    Reported-by: Andrej Shadura <andrew.shadura@collabora.co.uk>
    Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2020-02-16 19:02:22 +01:00
parent 4ace385809
commit e368d851e7
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shell/ash.c
View File

@ -9445,11 +9445,10 @@ expredir(union node *n)
case NFROMFD: case NFROMFD:
case NTOFD: /* >& */ case NTOFD: /* >& */
if (redir->ndup.vname) { if (redir->ndup.vname) {
expandarg(redir->ndup.vname, &fn, EXP_FULL | EXP_TILDE); expandarg(redir->ndup.vname, &fn, EXP_TILDE | EXP_REDIR);
if (fn.list == NULL) if (fn.list == NULL)
ash_msg_and_raise_error("redir error"); ash_msg_and_raise_error("redir error");
#if BASH_REDIR_OUTPUT #if BASH_REDIR_OUTPUT
//FIXME: we used expandarg with different args!
if (!isdigit_str9(fn.list->text)) { if (!isdigit_str9(fn.list->text)) {
/* >&file, not >&fd */ /* >&file, not >&fd */
if (redir->nfile.fd != 1) /* 123>&file - BAD */ if (redir->nfile.fd != 1) /* 123>&file - BAD */