diff options
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Src/exec.c | 24 |
2 files changed, 20 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 09d39cd0d..5041d171f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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> diff --git a/Src/exec.c b/Src/exec.c index bf50d0f32..fb2739acc 100644 --- a/Src/exec.c +++ b/Src/exec.c @@ -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) { |