circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-12 17:38:48 +00:00
Code Issues Projects Releases Wiki Activity

Ignore default-shell (and use /bin/sh) if it invalid not just if it is

Browse Source 
tmux itself, also refuse to set the option to something invalid in the
first place. GitHub issue 2120.
This commit is contained in:
nicm 2020-03-17 11:10:12 +00:00
parent fb396286ff
commit 115bb33257
5 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd-set-option.c
View File

@ -309,6 +309,13 @@ cmd_set_option_set(struct cmd *self, struct cmdq_item *item, struct options *oo,
old = xstrdup(options_get_string(oo, oe->name));
options_set_string(oo, oe->name, append, "%s", value);
new = options_get_string(oo, oe->name);
if (strcmp(oe->name, "default-shell") == 0 &&
!checkshell(new)) {
options_set_string(oo, oe->name, 0, "%s", old);
free(old);
cmdq_error(item, "not a suitable shell: %s", value);
return (-1);
}
if (oe->pattern != NULL && fnmatch(oe->pattern, new, 0) != 0) {
options_set_string(oo, oe->name, 0, "%s", old);
free(old);

4
server-client.c
View File

@ -400,6 +400,8 @@ server_client_exec(struct client *c, const char *cmd)
shell = options_get_string(s->options, "default-shell");
else
shell = options_get_string(global_s_options, "default-shell");
if (!checkshell(shell))
shell = _PATH_BSHELL;
shellsize = strlen(shell) + 1;
msg = xmalloc(cmdsize + shellsize);
@ -2009,7 +2011,7 @@ server_client_dispatch_shell(struct client *c)
const char *shell;
shell = options_get_string(global_s_options, "default-shell");
if (*shell == '\0' || areshell(shell))
if (!checkshell(shell))
shell = _PATH_BSHELL;
proc_send(c->peer, MSG_SHELL, -1, shell, strlen(shell) + 1);

2
spawn.c
View File

@ -320,7 +320,7 @@ spawn_pane(struct spawn_context *sc, char **cause)
/* Then the shell. If respawning, use the old one. */
if (~sc->flags & SPAWN_RESPAWN) {
tmp = options_get_string(s->options, "default-shell");
if (*tmp == '\0' || areshell(tmp))
if (!checkshell(tmp))
tmp = _PATH_BSHELL;
free(new_wp->shell);
new_wp->shell = xstrdup(tmp);

6
tmux.c
View File

@ -49,8 +49,8 @@ const char *shell_command;
static __dead void usage(void);
static char *make_label(const char *, char **);
static int areshell(const char *);
static const char *getshell(void);
static int checkshell(const char *);
static __dead void
usage(void)
@ -79,7 +79,7 @@ getshell(void)
return (_PATH_BSHELL);
}
static int
int
checkshell(const char *shell)
{
if (shell == NULL || *shell != '/')
@ -91,7 +91,7 @@ checkshell(const char *shell)
return (1);
}
int
static int
areshell(const char *shell)
{
const char *progname, *ptr;

2
tmux.h
View File

@ -1771,7 +1771,7 @@ extern const char *socket_path;
extern const char *shell_command;
extern int ptm_fd;
extern const char *shell_command;
int areshell(const char *);
int checkshell(const char *);
void setblocking(int, int);
const char *find_cwd(void);
const char *find_home(void);