diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2012-06-18 09:58:02 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2012-06-18 09:58:02 +0000 |
commit | a13b4a819a0a6d7d5763d12335eb82417093202d (patch) | |
tree | c4474ffcff8415f8546553be93214f8b6436e9e8 | |
parent | a4a2c68fa9428cc3ceb9c9630f4d54b9b91bf043 (diff) |
Add a couple of NULL pointer checks to key binding functions, from
jspenguin on SF bug 3535531.
-rw-r--r-- | key-bindings.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/key-bindings.c b/key-bindings.c index ea27848c..f020c19d 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; |