mirrors/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2025-10-22 17:11:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'obsd-master'

Browse Source
This commit is contained in:
Thomas Adam
2018-11-19 14:02:41 +00:00
parent a7da2357a5 749f67b7d8
commit efd01f3bfd
8 changed files with 24 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd-pipe-pane.c
View File

@@ -165,6 +165,8 @@ cmd_pipe_pane_exec(struct cmd *self, struct cmdq_item *item)
cmd_pipe_pane_write_callback, cmd_pipe_pane_write_callback,
cmd_pipe_pane_error_callback, cmd_pipe_pane_error_callback,
wp); wp);
if (wp->pipe_event == NULL)
fatalx("out of memory");
if (out) if (out)
bufferevent_enable(wp->pipe_event, EV_WRITE); bufferevent_enable(wp->pipe_event, EV_WRITE);
if (in) if (in)

2
control-notify.c
View File

@@ -47,6 +47,8 @@ control_notify_input(struct client *c, struct window_pane *wp,
*/ */
if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) { if (winlink_find_by_window(&c->session->windows, wp->window) != NULL) {
message = evbuffer_new(); message = evbuffer_new();
if (message == NULL)
fatalx("out of memory");
evbuffer_add_printf(message, "%%output %%%u ", wp->id); evbuffer_add_printf(message, "%%output %%%u ", wp->id);
for (i = 0; i < len; i++) { for (i = 0; i < len; i++) {
if (buf[i] < ' ' || buf[i] == '\\') if (buf[i] < ' ' || buf[i] == '\\')

4
format.c
View File

@@ -588,6 +588,8 @@ format_cb_pane_tabs(struct format_tree *ft, struct format_entry *fe)
return; return;
buffer = evbuffer_new(); buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
for (i = 0; i < wp->base.grid->sx; i++) { for (i = 0; i < wp->base.grid->sx; i++) {
if (!bit_test(wp->base.tabs, i)) if (!bit_test(wp->base.tabs, i))
continue; continue;
@@ -618,6 +620,8 @@ format_cb_session_group_list(struct format_tree *ft, struct format_entry *fe)
return; return;
buffer = evbuffer_new(); buffer = evbuffer_new();
if (buffer == NULL)
fatalx("out of memory");
TAILQ_FOREACH(loop, &sg->sessions, gentry) { TAILQ_FOREACH(loop, &sg->sessions, gentry) {
if (EVBUFFER_LENGTH(buffer) > 0) if (EVBUFFER_LENGTH(buffer) > 0)
evbuffer_add(buffer, ",", 1); evbuffer_add(buffer, ",", 1);

2
input.c
View File

@@ -767,6 +767,8 @@ input_init(struct window_pane *wp)
ictx->input_buf = xmalloc(INPUT_BUF_START); ictx->input_buf = xmalloc(INPUT_BUF_START);
ictx->since_ground = evbuffer_new(); ictx->since_ground = evbuffer_new();
if (ictx->since_ground == NULL)
fatalx("out of memory");
evtimer_set(&ictx->timer, input_timer_callback, ictx); evtimer_set(&ictx->timer, input_timer_callback, ictx);

2
job.c
View File

@@ -154,6 +154,8 @@ job_run(const char *cmd, struct session *s, const char *cwd,
job->event = bufferevent_new(job->fd, job_read_callback, job->event = bufferevent_new(job->fd, job_read_callback,
job_write_callback, job_error_callback, job); job_write_callback, job_error_callback, job);
if (job->event == NULL)
fatalx("out of memory");
bufferevent_enable(job->event, EV_READ|EV_WRITE); bufferevent_enable(job->event, EV_READ|EV_WRITE);
log_debug("run job %p: %s, pid %ld", job, job->cmd, (long) job->pid); log_debug("run job %p: %s, pid %ld", job, job->cmd, (long) job->pid);

6
server-client.c
View File

@@ -184,8 +184,14 @@ server_client_create(int fd)
TAILQ_INIT(&c->queue); TAILQ_INIT(&c->queue);
c->stdin_data = evbuffer_new(); c->stdin_data = evbuffer_new();
if (c->stdin_data == NULL)
fatalx("out of memory");
c->stdout_data = evbuffer_new(); c->stdout_data = evbuffer_new();
if (c->stdout_data == NULL)
fatalx("out of memory");
c->stderr_data = evbuffer_new(); c->stderr_data = evbuffer_new();
if (c->stderr_data == NULL)
fatalx("out of memory");
c->tty.fd = -1; c->tty.fd = -1;
c->title = NULL; c->title = NULL;

4
tty.c
View File

@@ -258,9 +258,13 @@ tty_open(struct tty *tty, char **cause)
event_set(&tty->event_in, tty->fd, EV_PERSIST|EV_READ, event_set(&tty->event_in, tty->fd, EV_PERSIST|EV_READ,
tty_read_callback, tty); tty_read_callback, tty);
tty->in = evbuffer_new(); tty->in = evbuffer_new();
if (tty->in == NULL)
fatal("out of memory");
event_set(&tty->event_out, tty->fd, EV_WRITE, tty_write_callback, tty); event_set(&tty->event_out, tty->fd, EV_WRITE, tty_write_callback, tty);
tty->out = evbuffer_new(); tty->out = evbuffer_new();
if (tty->out == NULL)
fatal("out of memory");
evtimer_set(&tty->timer, tty_timer_callback, tty); evtimer_set(&tty->timer, tty_timer_callback, tty);

2
window.c
View File

@@ -1010,6 +1010,8 @@ window_pane_spawn(struct window_pane *wp, int argc, char **argv,
wp->event = bufferevent_new(wp->fd, window_pane_read_callback, NULL, wp->event = bufferevent_new(wp->fd, window_pane_read_callback, NULL,
window_pane_error_callback, wp); window_pane_error_callback, wp);
if (wp->event == NULL)
fatalx("out of memory");
bufferevent_setwatermark(wp->event, EV_READ, 0, READ_SIZE); bufferevent_setwatermark(wp->event, EV_READ, 0, READ_SIZE);
bufferevent_enable(wp->event, EV_READ|EV_WRITE); bufferevent_enable(wp->event, EV_READ|EV_WRITE);