extern/tmate
1
0
Fork 0
mirror of https://github.com/tmate-io/tmate.git synced 2024-12-23 15:19:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Sync OpenBSD patchset 1165:

Browse Source 
Fix up window reference counting and don't crash if the rename timer
fires while the window is dead but still referenced. Fixes problem
reported by Michael Scholz.
This commit is contained in:
Tiago Cunha 2012-08-31 09:22:08 +00:00
parent 674545f7e6
commit 56e37487a8
4 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
names.c
View File

@ -50,6 +50,9 @@ window_name_callback(unused int fd, unused short events, void *data)
struct window *w = data;
char *name, *wname;
if (w->active == NULL)
return;
if (!options_get_number(&w->options, "automatic-rename")) {
if (event_initialized(&w->name_timer))
event_del(&w->name_timer);

3
notify.c
View File

@ -124,7 +124,8 @@ notify_drain(void)
if (ne->session != NULL)
ne->session->references--;
if (ne->window != NULL)
ne->window->references--;
window_remove_ref(ne->window);
TAILQ_REMOVE(&notify_queue, ne, entry);
free(ne);
}

1
tmux.h
View File

@ -2126,6 +2126,7 @@ struct window_pane *window_pane_find_down(struct window_pane *);
struct window_pane *window_pane_find_left(struct window_pane *);
struct window_pane *window_pane_find_right(struct window_pane *);
void window_set_name(struct window *, const char *);
void window_remove_ref(struct window *);
void winlink_clear_flags(struct winlink *);
void window_mode_attrs(struct grid_cell *, struct options *);

19
window.c
View File

@ -179,13 +179,8 @@ winlink_remove(struct winlinks *wwl, struct winlink *wl)
free(wl->status_text);
free(wl);
if (w != NULL) {
if (w->references == 0)
fatal("bad reference count");
w->references--;
if (w->references == 0)
window_destroy(w);
}
if (w != NULL)
window_remove_ref(w);
}
struct winlink *
@ -359,6 +354,16 @@ window_destroy(struct window *w)
free(w);
}
void
window_remove_ref(struct window *w)
{
if (w->references == 0)
fatal("bad reference count");
w->references--;
if (w->references == 0)
window_destroy(w);
}
void
window_set_name(struct window *w, const char *new_name)
{