From d8c7d877379385cdf30d84498db5e7f2e6da28b9 Mon Sep 17 00:00:00 2001 From: tim Date: Fri, 13 Mar 2020 20:49:13 +0000 Subject: Plug two memory leaks. Also get rid of a variable that is no longer necessary. OK okan@ --- client.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/client.c b/client.c index 653c0d4..ea97344 100644 --- a/client.c +++ b/client.c @@ -668,21 +668,23 @@ void client_set_name(struct client_ctx *cc) { struct winname *wn; - char *newname; int i = 0; - if (!xu_get_strprop(cc->win, ewmh[_NET_WM_NAME], &newname)) - if (!xu_get_strprop(cc->win, XA_WM_NAME, &newname)) - newname = xstrdup(""); + 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(""); TAILQ_FOREACH(wn, &cc->nameq, entry) { - if (strcmp(wn->name, newname) == 0) + if (strcmp(wn->name, cc->name) == 0) { TAILQ_REMOVE(&cc->nameq, wn, entry); + free(wn->name); + free(wn); + } i++; } - cc->name = newname; wn = xmalloc(sizeof(*wn)); - wn->name = xstrdup(newname); + wn->name = xstrdup(cc->name); TAILQ_INSERT_TAIL(&cc->nameq, wn, entry); /* Garbage collection. */ -- cgit 1.4.1