extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2025-02-02 19:39:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 960:

Browse Source 
Reject $SHELL if it is not a full path.
This commit is contained in:
Tiago Cunha 2011-10-02 11:32:24 +00:00
parent 326c5bf1b4
commit edd59d9e0f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tmux.c
View File

@ -101,7 +101,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

@ -694,7 +694,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);