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

Avoid use-after-free when cancelling copy mode.

Browse Source
This commit is contained in:
Nicholas Marriott 2010-03-14 23:17:59 +00:00
parent 51c135ed73
commit 51eab54102
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
window-copy.c
View File

@ -1,4 +1,4 @@
/* $Id: window-copy.c,v 1.109 2010-03-08 15:02:07 tcunha Exp $ */ /* $Id: window-copy.c,v 1.110 2010-03-14 23:17:59 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@ -256,9 +256,8 @@ window_copy_key(struct window_pane *wp, struct client *c, int key)
cmd = mode_key_lookup(&data->mdata, key); cmd = mode_key_lookup(&data->mdata, key);
switch (cmd) { switch (cmd) {
case MODEKEYCOPY_CANCEL: case MODEKEYCOPY_CANCEL:
for (; np != 0; np--)
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
break; return;
case MODEKEYCOPY_LEFT: case MODEKEYCOPY_LEFT:
for (; np != 0; np--) for (; np != 0; np--)
window_copy_cursor_left(wp); window_copy_cursor_left(wp);
@ -366,6 +365,7 @@ window_copy_key(struct window_pane *wp, struct client *c, int key)
if (c != NULL && c->session != NULL) { if (c != NULL && c->session != NULL) {
window_copy_copy_selection(wp, c); window_copy_copy_selection(wp, c);
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
return;
} }
break; break;
case MODEKEYCOPY_STARTOFLINE: case MODEKEYCOPY_STARTOFLINE: