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:
Nicholas Marriott
2012-08-21 10:00:33 +00:00
parent a1e4908ed7
commit 58e8e0eac8
4 changed files with 18 additions and 8 deletions

View File

@ -182,13 +182,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 *
@ -362,6 +357,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)
{