diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2014-02-21 08:03:42 +0000 |
| commit | c310212d28947f35595d945936e04148a39246d8 (patch) | |
| tree | 93447903c46b28e0bafe6fa234dc245d72bd00a0 /window-copy.c | |
| parent | 94d99d54629b182a4266d918ccf80e4daee4567b (diff) | |
| parent | 9120df33efdbaac82c152ed3d5995e2be7a70411 (diff) | |
| download | rtmux-c310212d28947f35595d945936e04148a39246d8.tar.gz rtmux-c310212d28947f35595d945936e04148a39246d8.tar.bz2 rtmux-c310212d28947f35595d945936e04148a39246d8.zip | |
Merge branch 'master' of ssh://git.code.sf.net/p/tmux/tmux-code
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 3e9ca492..527c95c2 100644 --- a/window-copy.c +++ b/window-copy.c @@ -1455,8 +1455,8 @@ window_copy_copy_buffer(struct window_pane *wp, int idx, void *buf, size_t len) if (idx == -1) { limit = options_get_number(&global_options, "buffer-limit"); paste_add(&global_buffers, buf, len, limit); - } else - paste_replace(&global_buffers, idx, buf, len); + } else if (paste_replace(&global_buffers, idx, buf, len) != 0) + free(buf); } void |