From: nicm <nicm@openbsd.org>
Date: Thu, 2 Jun 2022 21:19:32 +0000 (+0000)
Subject: Do not attempt to use client in config file (it will be NULL), GitHub
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2c14992ee465237aa7e5d4914c4550a085a848b9;p=openbsd

Do not attempt to use client in config file (it will be NULL), GitHub
issue 3206.
---

diff --git a/usr.bin/tmux/cmd-run-shell.c b/usr.bin/tmux/cmd-run-shell.c
index 2d4d4b81298..8b9ec15477b 100644
--- a/usr.bin/tmux/cmd-run-shell.c
+++ b/usr.bin/tmux/cmd-run-shell.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-run-shell.c,v 1.83 2022/05/30 13:00:18 nicm Exp $ */
+/* $OpenBSD: cmd-run-shell.c,v 1.84 2022/06/02 21:19:32 nicm Exp $ */
 
 /*
  * Copyright (c) 2009 Tiago Cunha <me@tiagocunha.org>
@@ -84,7 +84,7 @@ cmd_run_shell_print(struct job *job, const char *msg)
 
 	if (cdata->wp_id != -1)
 		wp = window_pane_find_by_id(cdata->wp_id);
-	if (wp == NULL && cdata->item != NULL)
+	if (wp == NULL && cdata->item != NULL && cdata->client != NULL)
 		wp = server_client_get_pane(cdata->client);
 	if (wp == NULL && cmd_find_from_nothing(&fs, 0) == 0)
 		wp = fs.wp;