circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 01:48:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1014:

Browse Source 
Call bufferevent_free before closing file descriptor associated with it
or bugs in $EventMechanism on $OtherOS makes libevent get it's knickers
in a twist. From Dylan Alex Simon.
This commit is contained in:
Tiago Cunha 2012-01-29 12:53:33 +00:00
parent 9c1d3046ca
commit e23df3af5a
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
job.c
View File

@ -123,10 +123,10 @@ job_free(struct job *job)
if (job->pid != -1) if (job->pid != -1)
kill(job->pid, SIGTERM); kill(job->pid, SIGTERM);
if (job->fd != -1)
close(job->fd);
if (job->event != NULL) if (job->event != NULL)
bufferevent_free(job->event); bufferevent_free(job->event);
if (job->fd != -1)
close(job->fd);
xfree(job); xfree(job);
} }

12
server-client.c
View File

@ -123,24 +123,24 @@ server_client_lost(struct client *c)
if (c->flags & CLIENT_TERMINAL) if (c->flags & CLIENT_TERMINAL)
tty_free(&c->tty); tty_free(&c->tty);
if (c->stdin_event != NULL)
bufferevent_free(c->stdin_event);
if (c->stdin_fd != -1) { if (c->stdin_fd != -1) {
setblocking(c->stdin_fd, 1); setblocking(c->stdin_fd, 1);
close(c->stdin_fd); close(c->stdin_fd);
} }
if (c->stdin_event != NULL) if (c->stdout_event != NULL)
bufferevent_free(c->stdin_event); bufferevent_free(c->stdout_event);
if (c->stdout_fd != -1) { if (c->stdout_fd != -1) {
setblocking(c->stdout_fd, 1); setblocking(c->stdout_fd, 1);
close(c->stdout_fd); close(c->stdout_fd);
} }
if (c->stdout_event != NULL) if (c->stderr_event != NULL)
bufferevent_free(c->stdout_event); bufferevent_free(c->stderr_event);
if (c->stderr_fd != -1) { if (c->stderr_fd != -1) {
setblocking(c->stderr_fd, 1); setblocking(c->stderr_fd, 1);
close(c->stderr_fd); close(c->stderr_fd);
} }
if (c->stderr_event != NULL)
bufferevent_free(c->stderr_event);
status_free_jobs(&c->status_new); status_free_jobs(&c->status_new);
status_free_jobs(&c->status_old); status_free_jobs(&c->status_old);

2
server-fn.c
View File

@ -337,8 +337,8 @@ server_destroy_pane(struct window_pane *wp)
old_fd = wp->fd; old_fd = wp->fd;
if (wp->fd != -1) { if (wp->fd != -1) {
close(wp->fd);
bufferevent_free(wp->event); bufferevent_free(wp->event);
close(wp->fd);
wp->fd = -1; wp->fd = -1;
} }

6
window.c
View File

@ -608,8 +608,8 @@ window_pane_destroy(struct window_pane *wp)
window_pane_reset_mode(wp); window_pane_reset_mode(wp);
if (wp->fd != -1) { if (wp->fd != -1) {
close(wp->fd);
bufferevent_free(wp->event); bufferevent_free(wp->event);
close(wp->fd);
} }
input_free(wp); input_free(wp);
@ -619,8 +619,8 @@ window_pane_destroy(struct window_pane *wp)
grid_destroy(wp->saved_grid); grid_destroy(wp->saved_grid);
if (wp->pipe_fd != -1) { if (wp->pipe_fd != -1) {
close(wp->pipe_fd);
bufferevent_free(wp->pipe_event); bufferevent_free(wp->pipe_event);
close(wp->pipe_fd);
} }
RB_REMOVE(window_pane_tree, &all_window_panes, wp); RB_REMOVE(window_pane_tree, &all_window_panes, wp);
@ -644,8 +644,8 @@ window_pane_spawn(struct window_pane *wp, const char *cmd, const char *shell,
struct termios tio2; struct termios tio2;
if (wp->fd != -1) { if (wp->fd != -1) {
close(wp->fd);
bufferevent_free(wp->event); bufferevent_free(wp->event);
close(wp->fd);
} }
if (cmd != NULL) { if (cmd != NULL) {
if (wp->cmd != NULL) if (wp->cmd != NULL)