From 697f9383550a8bb60ad09c22a6c208a0cf151e4e Mon Sep 17 00:00:00 2001 From: nicm Date: Wed, 18 Sep 2019 11:37:58 +0000 Subject: [PATCH] Do not set uninitialized signal mask when creating an empty pane. --- spawn.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/spawn.c b/spawn.c index 08d0426c..52763083 100644 --- a/spawn.c +++ b/spawn.c @@ -332,14 +332,6 @@ spawn_pane(struct spawn_context *sc, char **cause) cmd_log_argv(new_wp->argc, new_wp->argv, "%s", __func__); environ_log(child, "%s: environment ", __func__); - /* If the command is empty, don't fork a child process. */ - if (sc->flags & SPAWN_EMPTY) { - new_wp->flags |= PANE_EMPTY; - new_wp->base.mode &= ~MODE_CURSOR; - new_wp->base.mode |= MODE_CRLF; - goto complete; - } - /* Initialize the window size. */ memset(&ws, 0, sizeof ws); ws.ws_col = screen_size_x(&new_wp->base); @@ -349,6 +341,14 @@ spawn_pane(struct spawn_context *sc, char **cause) sigfillset(&set); sigprocmask(SIG_BLOCK, &set, &oldset); + /* If the command is empty, don't fork a child process. */ + if (sc->flags & SPAWN_EMPTY) { + new_wp->flags |= PANE_EMPTY; + new_wp->base.mode &= ~MODE_CURSOR; + new_wp->base.mode |= MODE_CRLF; + goto complete; + } + /* Fork the new process. */ new_wp->pid = fdforkpty(ptm_fd, &new_wp->fd, new_wp->tty, NULL, &ws); if (new_wp->pid == -1) {