cmd_mouse_pane can return NULL, check for that.
authornicm <nicm@openbsd.org>
Tue, 21 Apr 2015 15:16:06 +0000 (15:16 +0000)
committernicm <nicm@openbsd.org>
Tue, 21 Apr 2015 15:16:06 +0000 (15:16 +0000)
usr.bin/tmux/window-copy.c

index 87bf921..4f304cf 100644 (file)
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.128 2015/04/20 15:41:32 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.129 2015/04/21 15:16:06 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -2220,7 +2220,7 @@ window_copy_start_drag(struct client *c, unused struct mouse_event *m)
        u_int                    x, y;
 
        wp = cmd_mouse_pane(m, NULL, NULL);
-       if (wp->mode != &window_copy_mode)
+       if (wp == NULL || wp->mode != &window_copy_mode)
                return;
 
        if (cmd_mouse_at(wp, m, &x, &y, 1) != 0)
@@ -2242,7 +2242,7 @@ window_copy_drag_update(unused struct client *c, struct mouse_event *m)
        u_int                            x, y, old_cy;
 
        wp = cmd_mouse_pane(m, NULL, NULL);
-       if (wp->mode != &window_copy_mode)
+       if (wp == NULL || wp->mode != &window_copy_mode)
                return;
        data = wp->modedata;
 
@@ -2261,7 +2261,7 @@ window_copy_drag_release(unused struct client *c, struct mouse_event *m)
        struct window_pane      *wp;
 
        wp = cmd_mouse_pane(m, NULL, NULL);
-       if (wp->mode != &window_copy_mode)
+       if (wp == NULL || wp->mode != &window_copy_mode)
                return;
 
        window_copy_copy_selection(wp, NULL);