diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-07-02 16:23:54 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2009-07-02 16:23:54 +0000 |
| commit | 29ac832cb38f2193866a3fa5b14abc7537852eb4 (patch) | |
| tree | 862827f88fa3204e0e8bc24d8a50b0b5cfe327de /window-copy.c | |
| parent | 85dac1e378ed398ff5f6fd861b9874ec2f9ad2f5 (diff) | |
| download | rtmux-29ac832cb38f2193866a3fa5b14abc7537852eb4.tar.gz rtmux-29ac832cb38f2193866a3fa5b14abc7537852eb4.tar.bz2 rtmux-29ac832cb38f2193866a3fa5b14abc7537852eb4.zip | |
Fix two copy/paste bugs: forbid zero-length buffers to prevent a fatal error
when trying to paste them, found by me, and miscalculation of the start/end
causing random fatal errors when copying in copy-mode, reported by sthen.
Diffstat (limited to 'window-copy.c')
| -rw-r--r-- | window-copy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/window-copy.c b/window-copy.c index f25ef22b..71d4459c 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1,4 +1,4 @@ -/* $Id: window-copy.c,v 1.60 2009-05-04 17:58:27 nicm Exp $ */ +/* $Id: window-copy.c,v 1.61 2009-07-02 16:23:54 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -423,7 +423,7 @@ window_copy_copy_selection(struct window_pane *wp, struct client *c) /* Find start and end. */ xx = data->cx + data->ox; yy = screen_hsize(&wp->base) + data->cy - data->oy; - if (xx < data->selx || (yy == data->sely && xx < data->selx)) { + if (yy < data->sely || (yy == data->sely && xx < data->selx)) { sx = xx; sy = yy; ex = data->selx; ey = data->sely; } else { |