circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-11-04 09:26:05 +00:00
Code Issues Projects Releases Wiki Activity

Fix two copy/paste bugs: forbid zero-length buffers to prevent a fatal error

Browse Source 
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.
This commit is contained in:
Nicholas Marriott
2009-07-02 16:23:54 +00:00
parent 85dac1e378
commit 29ac832cb3
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd-paste-buffer.c
View File

@@ -1,4 +1,4 @@
/* $Id: cmd-paste-buffer.c,v 1.15 2009-01-19 18:23:40 nicm Exp $ */
/* $Id: cmd-paste-buffer.c,v 1.16 2009-07-02 16:23:54 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -63,7 +63,7 @@ cmd_paste_buffer_exec(struct cmd *self, struct cmd_ctx *ctx)
}
}
if (pb != NULL)
if (pb != NULL && *pb->data != '\0')
buffer_write(w->active->out, pb->data, strlen(pb->data));
/* Delete the buffer if -d. */

5
paste.c
View File

@@ -1,4 +1,4 @@
/* $Id: paste.c,v 1.6 2009-01-25 18:51:28 tcunha Exp $ */
/* $Id: paste.c,v 1.7 2009-07-02 16:23:54 nicm Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -101,6 +101,9 @@ paste_add(struct paste_stack *ps, char *data, u_int limit)
{
struct paste_buffer *pb;
if (*data == '\0')
return;
while (ARRAY_LENGTH(ps) >= limit)
ARRAY_TRUNC(ps, 1);

4
window-copy.c
View File

@@ -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 {