nixo
/
gri3-wm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix memleak: free con->name before overwriting it

This commit is contained in:
Michael Stapelberg 2011-01-04 22:38:33 +01:00
parent bdbda20293
commit 80ecd157f6
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/tree.c
View File

@ -49,6 +49,7 @@ void tree_init() {
Output *output;
croot = con_new(NULL);
FREE(croot->name);
croot->name = "root";
croot->type = CT_ROOT;
@ -60,6 +61,7 @@ void tree_init() {
continue;
Con *oc = con_new(croot);
FREE(oc->name);
oc->name = strdup(output->name);
oc->type = CT_OUTPUT;
oc->rect = output->rect;
@ -74,6 +76,7 @@ void tree_init() {
ws = con_new(NULL);
ws->type = CT_WORKSPACE;
ws->num = c;
FREE(ws->name);
asprintf(&(ws->name), "%d", c);
c++;
con_attach(ws, oc, false);

3
src/workspace.c
View File

@ -46,7 +46,8 @@ Con *workspace_get(const char *num) {
x_set_name(workspace, name);
free(name);
workspace->type = CT_WORKSPACE;
workspace->name = strdup(num);
FREE(workspace->name);
workspace->name = sstrdup(num);
/* We set ->num to the number if this workspace’s name consists only of
* a positive number. Otherwise it’s a named ws and num will be -1. */
char *end;