From dd0de3d2b93f228ae00b7b2c38f6dd1e1a0630dc Mon Sep 17 00:00:00 2001
From: tim
Date: Sat, 14 Mar 2020 16:11:09 +0000
Subject: Revert previous. Causes a crash as reported by Tom Murphy.

---
 client.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'client.c')

diff --git a/client.c b/client.c
index cb3f916..5bea5f5 100644
--- a/client.c
+++ b/client.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: client.c,v 1.259 2020/03/13 20:49:13 tim Exp $
+ * $OpenBSD: client.c,v 1.260 2020/03/14 16:11:09 tim Exp $
  */
 
 #include <sys/types.h>
@@ -668,23 +668,21 @@ void
 client_set_name(struct client_ctx *cc)
 {
 	struct winname	*wn;
+	char		*newname;
 	int		 i = 0;
 
-	free(cc->name);
-	if (!xu_get_strprop(cc->win, ewmh[_NET_WM_NAME], &cc->name))
-		if (!xu_get_strprop(cc->win, XA_WM_NAME, &cc->name))
-			cc->name = xstrdup("");
+	if (!xu_get_strprop(cc->win, ewmh[_NET_WM_NAME], &newname))
+		if (!xu_get_strprop(cc->win, XA_WM_NAME, &newname))
+			newname = xstrdup("");
 
 	TAILQ_FOREACH(wn, &cc->nameq, entry) {
-		if (strcmp(wn->name, cc->name) == 0) {
+		if (strcmp(wn->name, newname) == 0)
 			TAILQ_REMOVE(&cc->nameq, wn, entry);
-			free(wn->name);
-			free(wn);
-		}
 		i++;
 	}
+	cc->name = newname;
 	wn = xmalloc(sizeof(*wn));
-	wn->name = xstrdup(cc->name);
+	wn->name = xstrdup(newname);
 	TAILQ_INSERT_TAIL(&cc->nameq, wn, entry);
 
 	/* Garbage collection. */
-- 
cgit v1.2.3-2-gb3c3