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

msh: fix obscure case with backticks and closed fd 1

Browse Source
This commit is contained in:
Denis Vlasenko 2007-05-09 22:16:08 +00:00
parent 389f9d52d5
commit 2b54aaa9bf
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
shell/msh.c
View File

@ -2546,7 +2546,7 @@ static int execute(struct op *t, int *pin, int *pout, int act)
interactive = 0; interactive = 0;
if (pin == NULL) { if (pin == NULL) {
close(0); close(0);
open(bb_dev_null, O_RDONLY); xopen(bb_dev_null, O_RDONLY);
} }
_exit(execute(t->left, pin, pout, FEXEC)); _exit(execute(t->left, pin, pout, FEXEC));
} }
@ -2823,12 +2823,12 @@ static int forkexec(struct op *t, int *pin, int *pout, int act, char **wp)
#endif #endif
if (pin != NULL) { if (pin != NULL) {
dup2(pin[0], 0); xmove_fd(pin[0], 0);
closepipe(pin); if (pin[1] != 0) close(pin[1]);
} }
if (pout != NULL) { if (pout != NULL) {
dup2(pout[1], 1); xmove_fd(pout[1], 1);
closepipe(pout); if (pout[1] != 1) close(pout[0]);
} }
iopp = t->ioact; iopp = t->ioact;
@ -4166,8 +4166,13 @@ static int grave(int quoted)
if (ourtrap[j] && signal(j, SIG_IGN) != SIG_IGN) if (ourtrap[j] && signal(j, SIG_IGN) != SIG_IGN)
signal(j, SIG_DFL); signal(j, SIG_DFL);
dup2(pf[1], 1); /* Testcase where below checks are needed:
closepipe(pf); * close stdout & run this script:
* files=`ls`
* echo "$files" >zz
*/
xmove_fd(pf[1], 1);
if (pf[0] != 1) close(pf[0]);
argument_list[0] = (char *) DEFAULT_SHELL; argument_list[0] = (char *) DEFAULT_SHELL;
argument_list[1] = (char *) "-c"; argument_list[1] = (char *) "-c";