mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-01-23 00:41:03 +01:00
Code Releases Activity

33100: check $fd more rigorously in "exec {fd}<&-"

Browse source
This commit is contained in:
Barton E. Schaefer 2014-09-03 08:46:56 -07:00
parent 6d9635b0bd
commit a3b1e3ffb1
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -1,5 +1,7 @@
2014-09-03 Barton E. Schaefer <schaefer@zsh.org>
* 33100: Src/exec.c: check $fd more rigorously in "exec {fd}<&-"
* 33088: Completion/Base/Widget/_complete_debug: indentation in $PS4
2014-09-01 Peter Stephenson <p.w.stephenson@ntlworld.com>

24
Src/exec.c
View file

@ -3050,7 +3050,7 @@ execcmd(Estate state, int input, int output, int how, int last1)
break;
case REDIR_CLOSE:
if (fn->varid) {
char *s = fn->varid;
char *s = fn->varid, *t;
struct value vbuf;
Value v;
int bad = 0;
@ -3060,13 +3060,25 @@ execcmd(Estate state, int input, int output, int how, int last1)
} else if (v->pm->node.flags & PM_READONLY) {
bad = 2;
} else {
fn->fd1 = (int)getintvalue(v);
s = getstrvalue(v);
if (errflag)
bad = 1;
else if (fn->fd1 <= max_zsh_fd) {
if (fn->fd1 >= 10 &&
fdtable[fn->fd1] == FDT_INTERNAL)
bad = 3;
else {
fn->fd1 = zstrtol(s, &t, 0);
if (s == t)
bad = 1;
else if (*t) {
/* Check for base#number format */
if (*t == '#' && *s != '0')
fn->fd1 = zstrtol(s = t+1, &t, fn->fd1);
if (s == t || *t)
bad = 1;
}
if (!bad && fn->fd1 <= max_zsh_fd) {
if (fn->fd1 >= 10 &&
fdtable[fn->fd1] == FDT_INTERNAL)
bad = 3;
}
}
}
if (bad) {