circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-11-13 23:58:51 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 1057:

Browse Source 
Check event_initialized before event_del if event may not have been set
up; libevent2 complains about this. Reported by Moriyoshi Koizumi.
This commit is contained in:
Tiago Cunha 2012-03-18 01:59:34 +00:00
parent 5aa28473dd
commit 0987d55231
7 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
names.c
View File

@ -36,7 +36,8 @@ queue_window_name(struct window *w)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = NAME_INTERVAL * 1000L; tv.tv_usec = NAME_INTERVAL * 1000L;
evtimer_del(&w->name_timer); if (event_initialized(&w->name_timer))
evtimer_del(&w->name_timer);
evtimer_set(&w->name_timer, window_name_callback, w); evtimer_set(&w->name_timer, window_name_callback, w);
evtimer_add(&w->name_timer, &tv); evtimer_add(&w->name_timer, &tv);
} }

9
server-client.c
View File

@ -152,11 +152,13 @@ server_client_lost(struct client *c)
evtimer_del(&c->repeat_timer); evtimer_del(&c->repeat_timer);
evtimer_del(&c->identify_timer); if (event_initialized(&c->identify_timer))
evtimer_del(&c->identify_timer);
if (c->message_string != NULL) if (c->message_string != NULL)
xfree(c->message_string); xfree(c->message_string);
evtimer_del(&c->message_timer); if (event_initialized (&c->message_timer))
evtimer_del(&c->message_timer);
for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) { for (i = 0; i < ARRAY_LENGTH(&c->message_log); i++) {
msg = &ARRAY_ITEM(&c->message_log, i); msg = &ARRAY_ITEM(&c->message_log, i);
xfree(msg->msg); xfree(msg->msg);
@ -175,7 +177,8 @@ server_client_lost(struct client *c)
close(c->ibuf.fd); close(c->ibuf.fd);
imsg_clear(&c->ibuf); imsg_clear(&c->ibuf);
event_del(&c->event); if (event_initialized(&c->event))
event_del(&c->event);
for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) { for (i = 0; i < ARRAY_LENGTH(&dead_clients); i++) {
if (ARRAY_ITEM(&dead_clients, i) == NULL) { if (ARRAY_ITEM(&dead_clients, i) == NULL) {

6
server-fn.c
View File

@ -453,7 +453,8 @@ server_set_identify(struct client *c)
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;
evtimer_del(&c->identify_timer); if (event_initialized (&c->identify_timer))
evtimer_del(&c->identify_timer);
evtimer_set(&c->identify_timer, server_callback_identify, c); evtimer_set(&c->identify_timer, server_callback_identify, c);
evtimer_add(&c->identify_timer, &tv); evtimer_add(&c->identify_timer, &tv);
@ -491,7 +492,8 @@ server_update_event(struct client *c)
events |= EV_READ; events |= EV_READ;
if (c->ibuf.w.queued > 0) if (c->ibuf.w.queued > 0)
events |= EV_WRITE; events |= EV_WRITE;
event_del(&c->event); if (event_initialized(&c->event))
event_del(&c->event);
event_set(&c->event, c->ibuf.fd, events, server_client_callback, c); event_set(&c->event, c->ibuf.fd, events, server_client_callback, c);
event_add(&c->event, NULL); event_add(&c->event, NULL);
} }

3
status.c
View File

@ -776,7 +776,8 @@ status_message_set(struct client *c, const char *fmt, ...)
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;
evtimer_del(&c->message_timer); if (event_initialized (&c->message_timer))
evtimer_del(&c->message_timer);
evtimer_set(&c->message_timer, status_message_callback, c); evtimer_set(&c->message_timer, status_message_callback, c);
evtimer_add(&c->message_timer, &tv); evtimer_add(&c->message_timer, &tv);

6
tty-keys.c
View File

@ -549,7 +549,8 @@ start_timer:
tv.tv_sec = delay / 1000; tv.tv_sec = delay / 1000;
tv.tv_usec = (delay % 1000) * 1000L; tv.tv_usec = (delay % 1000) * 1000L;
evtimer_del(&tty->key_timer); if (event_initialized(&tty->key_timer))
evtimer_del(&tty->key_timer);
evtimer_set(&tty->key_timer, tty_keys_callback, tty); evtimer_set(&tty->key_timer, tty_keys_callback, tty);
evtimer_add(&tty->key_timer, &tv); evtimer_add(&tty->key_timer, &tv);
@ -573,7 +574,8 @@ found_key:
goto handle_key; goto handle_key;
handle_key: handle_key:
evtimer_del(&tty->key_timer); if (event_initialized(&tty->key_timer))
evtimer_del(&tty->key_timer);
if (key != KEYC_NONE) if (key != KEYC_NONE)
tty->key_callback(key, &mouse, tty->key_data); tty->key_callback(key, &mouse, tty->key_data);

3
tty.c
View File

@ -279,7 +279,8 @@ tty_close(struct tty *tty)
tty->log_fd = -1; tty->log_fd = -1;
} }
evtimer_del(&tty->key_timer); if (event_initialized(&tty->key_timer))
evtimer_del(&tty->key_timer);
tty_stop_tty(tty); tty_stop_tty(tty);
if (tty->flags & TTY_OPENED) { if (tty->flags & TTY_OPENED) {

3
window.c
View File

@ -347,7 +347,8 @@ window_destroy(struct window *w)
if (w->layout_root != NULL) if (w->layout_root != NULL)
layout_free(w); layout_free(w);
evtimer_del(&w->name_timer); if (event_initialized(&w->name_timer))
evtimer_del(&w->name_timer);
options_free(&w->options); options_free(&w->options);