circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-04-04 15:25:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam 2017-01-24 14:01:15 +00:00
commit f1282a683d
2 changed files with 5 additions and 2 deletions

4
paste.c
View File

@ -162,8 +162,10 @@ paste_add(char *data, size_t size)
struct paste_buffer *pb, *pb1; struct paste_buffer *pb, *pb1;
u_int limit; u_int limit;
if (size == 0) if (size == 0) {
free(data);
return; return;
}
limit = options_get_number(global_options, "buffer-limit"); limit = options_get_number(global_options, "buffer-limit");
RB_FOREACH_REVERSE_SAFE(pb, paste_time_tree, &paste_by_time, pb1) { RB_FOREACH_REVERSE_SAFE(pb, paste_time_tree, &paste_by_time, pb1) {

3
window.c
View File

@ -892,7 +892,8 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
ws.ws_col = screen_size_x(&wp->base); ws.ws_col = screen_size_x(&wp->base);
ws.ws_row = screen_size_y(&wp->base); ws.ws_row = screen_size_y(&wp->base);
switch (wp->pid = pty_fork(ptm_fd, &wp->fd, wp->tty, sizeof wp->tty, &ws)) { wp->pid = pty_fork(ptm_fd, &wp->fd, wp->tty, sizeof wp->tty, &ws);
switch (wp->pid) {
case -1: case -1:
wp->fd = -1; wp->fd = -1;
xasprintf(cause, "%s: %s", cmd, strerror(errno)); xasprintf(cause, "%s: %s", cmd, strerror(errno));