aboutsummaryrefslogtreecommitdiff
path: root/sway/tree
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2018-07-06 08:43:33 -0700
committerGitHub <noreply@github.com>2018-07-06 08:43:33 -0700
commit817e847749240a0c04756c37c88dc554efc56c9e (patch)
treeef2a716f8ea06ce8bdc63d1a682901b24e5bfcf0 /sway/tree
parent55c54bb63b82ee75e1893b48b3ce18f7317c6199 (diff)
parentb3c55dd909b070625c9bfcebcb89cb8463e2ffc9 (diff)
downloadsway-817e847749240a0c04756c37c88dc554efc56c9e.tar.xz
Merge pull request #2206 from martinetd/leaks
Fix a bunch of leaks
Diffstat (limited to 'sway/tree')
-rw-r--r--sway/tree/container.c1
-rw-r--r--sway/tree/view.c2
-rw-r--r--sway/tree/workspace.c2
3 files changed, 4 insertions, 1 deletions
diff --git a/sway/tree/container.c b/sway/tree/container.c
index 3614d4e7..9093feba 100644
--- a/sway/tree/container.c
+++ b/sway/tree/container.c
@@ -151,6 +151,7 @@ void container_free(struct sway_container *cont) {
return;
}
free(cont->name);
+ free(cont->formatted_title);
wlr_texture_destroy(cont->title_focused);
wlr_texture_destroy(cont->title_focused_inactive);
wlr_texture_destroy(cont->title_unfocused);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 6b4daa82..bca8ef8a 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -514,7 +514,7 @@ void view_map(struct sway_view *view, struct wlr_surface *wlr_surface) {
if (container_is_floating(focus)) {
focus = focus->parent->parent;
}
- free(criterias);
+ list_free(criterias);
cont = container_view_create(focus, view);
view->surface = wlr_surface;
diff --git a/sway/tree/workspace.c b/sway/tree/workspace.c
index 2db06a31..51f0fcb4 100644
--- a/sway/tree/workspace.c
+++ b/sway/tree/workspace.c
@@ -191,6 +191,8 @@ char *workspace_next_name(const char *output_name) {
free(target);
target = _target;
wlr_log(L_DEBUG, "Workspace: Found free name %s", _target);
+ } else {
+ free(_target);
}
}
free(dup);