circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 00:56:10 +00:00
Code Issues Projects Releases Wiki Activity

Reject $SHELL if it is not a full path.

Browse Source
This commit is contained in:
Nicholas Marriott
2011-09-25 18:53:04 +00:00
parent f14da260c8
commit e6a59c4bee
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tmux.c
View File

@@ -98,7 +98,9 @@ getshell(void)
int int
checkshell(const char *shell) checkshell(const char *shell)
{ {
if (shell == NULL || *shell == '\0' || areshell(shell)) if (shell == NULL || *shell == '\0' || *shell != '/')
return (0);
if (areshell(shell))
return (0); return (0);
if (access(shell, X_OK) != 0) if (access(shell, X_OK) != 0)
return (0); return (0);

2
window.c
View File

@@ -697,7 +697,7 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
if (*wp->cmd != '\0') { if (*wp->cmd != '\0') {
/* Set SHELL but only if it is currently not useful. */ /* Set SHELL but only if it is currently not useful. */
shell = getenv("SHELL"); shell = getenv("SHELL");
if (shell == NULL || *shell == '\0' || areshell(shell)) if (checkshell(shell))
setenv("SHELL", wp->shell, 1); setenv("SHELL", wp->shell, 1);
execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL); execl(_PATH_BSHELL, "sh", "-c", wp->cmd, (char *) NULL);