From b3dc7a2c16729080563c62aa6b340f2072d8ab87 Mon Sep 17 00:00:00 2001 From: nicm Date: Sun, 9 Jul 2023 22:54:52 +0000 Subject: [PATCH] Call closefrom after removing signals because newer libevent doesn't like its signal fd being closed Azat Khuzhin. --- usr.bin/tmux/spawn.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.bin/tmux/spawn.c b/usr.bin/tmux/spawn.c index 3e67eaee705..aee6630f5d9 100644 --- a/usr.bin/tmux/spawn.c +++ b/usr.bin/tmux/spawn.c @@ -1,4 +1,4 @@ -/* $OpenBSD: spawn.c,v 1.31 2022/08/10 14:03:59 nicm Exp $ */ +/* $OpenBSD: spawn.c,v 1.32 2023/07/09 22:54:52 nicm Exp $ */ /* * Copyright (c) 2019 Nicholas Marriott @@ -415,8 +415,8 @@ spawn_pane(struct spawn_context *sc, char **cause) _exit(1); /* Clean up file descriptors and signals and update the environment. */ - closefrom(STDERR_FILENO + 1); proc_clear_signals(server_proc, 1); + closefrom(STDERR_FILENO + 1); sigprocmask(SIG_SETMASK, &oldset, NULL); log_close(); environ_push(child); -- 2.20.1