From 56447d73c1348c708f36a624416c008e6b262293 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Fri, 13 Nov 2009 16:59:19 +0000 Subject: [PATCH] Sync OpenBSD patchset 534: Use winlink_remove() to remove old winlinks when synchronizing grouped sessions rather than doing it manually and not adjusted the reference count. Fixes crash seen by Dan Harnett. --- session.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/session.c b/session.c index 6d78f891..5cdb1461 100644 --- a/session.c +++ b/session.c @@ -1,4 +1,4 @@ -/* $Id: session.c,v 1.70 2009-11-04 22:42:31 tcunha Exp $ */ +/* $Id: session.c,v 1.71 2009-11-13 16:59:19 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -588,7 +588,6 @@ session_group_synchronize1(struct session *target, struct session *s) /* Then free the old winlinks list. */ while (!RB_EMPTY(&old_windows)) { wl = RB_ROOT(&old_windows); - RB_REMOVE(winlinks, &old_windows, wl); - xfree(wl); + winlink_remove(&old_windows, wl); } }