h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-05-31 03:51:14 -03:00
Code Issues Packages Projects Releases Wiki Activity

Ignore user-supplied fd redirections above 2 for builtins

Browse Source 
Prevents e.g. specifying an fd which corresponds to the history file
as the stdin for builtin_source
This commit is contained in:
ridiculousfish
2015-01-08 10:44:05 -08:00
parent 7864d0d416
commit 34db67680d
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
exec.cpp
View File

@@ -366,7 +366,7 @@ static bool io_transmogrify(const io_chain_t &in_chain, io_chain_t *out_chain, s
}
opened_fds.push_back(fd);
out.reset(new io_fd_t(in->fd, fd));
out.reset(new io_fd_t(in->fd, fd, false));
break;
}
@@ -867,7 +867,7 @@ void exec_job(parser_t &parser, job_t *j)
case INTERNAL_BUILTIN:
{
int local_builtin_stdin = 0;
int local_builtin_stdin = STDIN_FILENO;
bool close_stdin = false;
/*
@@ -887,7 +887,11 @@ void exec_job(parser_t &parser, job_t *j)
case IO_FD:
{
CAST_INIT(const io_fd_t *, in_fd, in.get());
local_builtin_stdin = in_fd->old_fd;
/* Ignore user-supplied fd redirections from an fd other than the standard ones. e.g. in source <&3 don't actually read from fd 3, which is internal to fish. We still respect this redirection in that we pass it on as a block IO to the code that source runs, and therefore this is not an error. Non-user supplied fd redirections come about through transmogrification, and we need to respect those here. */
if (! in_fd->user_supplied || (in_fd->old_fd >= 0 && in_fd->old_fd < 3))
{
local_builtin_stdin = in_fd->old_fd;
}
break;
}
case IO_PIPE: