Revision: 2685
http://tmux.svn.sourceforge.net/tmux/?rev=2685&view=rev
Author: tcunha
Date: 2012-01-29 12:53:33 +0000 (Sun, 29 Jan 2012)
Log Message:
-----------
Sync OpenBSD patchset 1014:
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.
Modified Paths:
--------------
trunk/job.c
trunk/server-client.c
trunk/server-fn.c
trunk/window.c
Modified: trunk/job.c
===================================================================
--- trunk/job.c 2012-01-29 12:52:16 UTC (rev 2684)
+++ trunk/job.c 2012-01-29 12:53:33 UTC (rev 2685)
@@ -123,10 +123,10 @@
if (job->pid != -1)
kill(job->pid, SIGTERM);
+ if (job->event != NULL)
+ bufferevent_free(job->event);
if (job->fd != -1)
close(job->fd);
- if (job->event != NULL)
- bufferevent_free(job->event);
xfree(job);
}
Modified: trunk/server-client.c
===================================================================
--- trunk/server-client.c 2012-01-29 12:52:16 UTC (rev 2684)
+++ trunk/server-client.c 2012-01-29 12:53:33 UTC (rev 2685)
@@ -123,24 +123,24 @@
if (c->flags & CLIENT_TERMINAL)
tty_free(&c->tty);
+ if (c->stdin_event != NULL)
+ bufferevent_free(c->stdin_event);
if (c->stdin_fd != -1) {
setblocking(c->stdin_fd, 1);
close(c->stdin_fd);
}
- if (c->stdin_event != NULL)
- bufferevent_free(c->stdin_event);
+ if (c->stdout_event != NULL)
+ bufferevent_free(c->stdout_event);
if (c->stdout_fd != -1) {
setblocking(c->stdout_fd, 1);
close(c->stdout_fd);
}
- if (c->stdout_event != NULL)
- bufferevent_free(c->stdout_event);
+ if (c->stderr_event != NULL)
+ bufferevent_free(c->stderr_event);
if (c->stderr_fd != -1) {
setblocking(c->stderr_fd, 1);
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_old);
Modified: trunk/server-fn.c
===================================================================
--- trunk/server-fn.c 2012-01-29 12:52:16 UTC (rev 2684)
+++ trunk/server-fn.c 2012-01-29 12:53:33 UTC (rev 2685)
@@ -337,8 +337,8 @@
old_fd = wp->fd;
if (wp->fd != -1) {
+ bufferevent_free(wp->event);
close(wp->fd);
- bufferevent_free(wp->event);
wp->fd = -1;
}
Modified: trunk/window.c
===================================================================
--- trunk/window.c 2012-01-29 12:52:16 UTC (rev 2684)
+++ trunk/window.c 2012-01-29 12:53:33 UTC (rev 2685)
@@ -608,8 +608,8 @@
window_pane_reset_mode(wp);
if (wp->fd != -1) {
+ bufferevent_free(wp->event);
close(wp->fd);
- bufferevent_free(wp->event);
}
input_free(wp);
@@ -619,8 +619,8 @@
grid_destroy(wp->saved_grid);
if (wp->pipe_fd != -1) {
+ bufferevent_free(wp->pipe_event);
close(wp->pipe_fd);
- bufferevent_free(wp->pipe_event);
}
RB_REMOVE(window_pane_tree, &all_window_panes, wp);
@@ -644,8 +644,8 @@
struct termios tio2;
if (wp->fd != -1) {
+ bufferevent_free(wp->event);
close(wp->fd);
- bufferevent_free(wp->event);
}
if (cmd != NULL) {
if (wp->cmd != NULL)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
tmux-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tmux-cvs
