aboutsummaryrefslogtreecommitdiff
path: root/window-copy.c
diff options
context:
space:
mode:
authorThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
committerThomas Adam <thomas@xteddy.org>2014-02-19 15:05:07 +0000
commitca1d78f5230e0c3ab4c3b15fff2597fbdb037b48 (patch)
treea9e33fd328e948a4ef9a57d6cc2fe3d82cbf128c /window-copy.c
parentb3de4a3dec85bc84bb83da6b46e2a8e2a634ace3 (diff)
parent6daf06b1ad61f67e9f7780d787451b9b5f82dd43 (diff)
downloadrtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.gz
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.tar.bz2
rtmux-ca1d78f5230e0c3ab4c3b15fff2597fbdb037b48.zip
Merge branch 'obsd-master'
Diffstat (limited to 'window-copy.c')
-rw-r--r--window-copy.c4
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