circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-16 01:18:52 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1136:

Browse Source 
Add a couple of NULL pointer checks to key binding functions, from
jspenguin on SF bug 3535531.
This commit is contained in:
Tiago Cunha 2012-06-18 15:15:32 +00:00
parent 2a36a0a067
commit fce30422f3
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
key-bindings.c
View File

@ -207,6 +207,9 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
va_list ap; va_list ap;
char *msg; char *msg;
if (ctx->curclient->session == NULL)
return;
va_start(ap, fmt); va_start(ap, fmt);
xvasprintf(&msg, fmt, ap); xvasprintf(&msg, fmt, ap);
va_end(ap); va_end(ap);
@ -219,9 +222,13 @@ key_bindings_error(struct cmd_ctx *ctx, const char *fmt, ...)
void printflike2 void printflike2
key_bindings_print(struct cmd_ctx *ctx, const char *fmt, ...) key_bindings_print(struct cmd_ctx *ctx, const char *fmt, ...)
{ {
struct winlink *wl = ctx->curclient->session->curw; struct winlink *wl;
va_list ap; va_list ap;
if (ctx->curclient->session == NULL)
return;
wl = ctx->curclient->session->curw;
if (wl->window->active->mode != &window_copy_mode) { if (wl->window->active->mode != &window_copy_mode) {
window_pane_reset_mode(wl->window->active); window_pane_reset_mode(wl->window->active);
window_pane_set_mode(wl->window->active, &window_copy_mode); 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; va_list ap;
char *msg; char *msg;
if (ctx->curclient->session == NULL)
return;
if (options_get_number(&global_options, "quiet")) if (options_get_number(&global_options, "quiet"))
return; return;