From fce30422f35865c0a5a24f63dde604329f12792e Mon Sep 17 00:00:00 2001
From: Tiago Cunha <tcunha@gmx.com>
Date: Mon, 18 Jun 2012 15:15:32 +0000
Subject: [PATCH] Sync OpenBSD patchset 1136:

Add a couple of NULL pointer checks to key binding functions, from
jspenguin on SF bug 3535531.
---
 key-bindings.c | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/key-bindings.c b/key-bindings.c
index 8df6046c..b80728b9 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -207,6 +207,9 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
 	va_list	ap;
 	char   *msg;
 
+	if (ctx->curclient->session == NULL)
+		return;
+
 	va_start(ap, fmt);
 	xvasprintf(&msg, fmt, ap);
 	va_end(ap);
@@ -219,9 +222,13 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
 void printflike2
 key_bindings_print(struct cmd_ctx *ctx, const char *fmt, ...)
 {
-	struct winlink	*wl = ctx->curclient->session->curw;
+	struct winlink	*wl;
 	va_list		 ap;
 
+	if (ctx->curclient->session == NULL)
+		return;
+
+	wl = ctx->curclient->session->curw;
 	if (wl->window->active->mode != &window_copy_mode) {
 		window_pane_reset_mode(wl->window->active);
 		window_pane_set_mode(wl->window->active, &window_copy_mode);
@@ -239,6 +246,9 @@ key_bindings_info(struct cmd_ctx *ctx, const char *fmt, ...)
 	va_list	ap;
 	char   *msg;
 
+	if (ctx->curclient->session == NULL)
+		return;
+
 	if (options_get_number(&global_options, "quiet"))
 		return;