Merge pull request #2289 from frsfnrrg/memory-fixes1.0-alpha.4

Fix memory leaks and reference to uninitialized 

5 files changed, 17 insertions, 10 deletions

diff --git a/sway/config.c b/sway/config.c
index 2c051146..c620e4c7 100644
--- a/sway/config.c
+++ b/sway/config.c
@@ -24,6 +24,7 @@
 #include "sway/input/seat.h"
 #include "sway/commands.h"
 #include "sway/config.h"
+#include "sway/criteria.h"
 #include "sway/tree/arrange.h"
 #include "sway/tree/layout.h"
 #include "sway/tree/workspace.h"
@@ -105,7 +106,12 @@ void free_config(struct sway_config *config) {
                 }
                 list_free(config->seat_configs);
         }
-        list_free(config->criteria);
+        if (config->criteria) {
+                for (int i = 0; i < config->criteria->length; ++i) {
+                        criteria_destroy(config->criteria->items[i]);
+                }
+                list_free(config->criteria);
+        }
         list_free(config->no_focus);
         list_free(config->active_bar_modifiers);
         list_free(config->config_chain);
diff --git a/sway/criteria.c b/sway/criteria.c
index c999d248..e2b248de 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -37,7 +37,7 @@ void criteria_destroy(struct criteria *criteria) {
         pcre_free(criteria->con_mark);
         pcre_free(criteria->window_role);
         free(criteria->workspace);
-
+        free(criteria->cmdlist);
         free(criteria->raw);
         free(criteria);
 }
diff --git a/sway/desktop/idle_inhibit_v1.c b/sway/desktop/idle_inhibit_v1.c
index 108a8417..da17d0f2 100644
--- a/sway/desktop/idle_inhibit_v1.c
+++ b/sway/desktop/idle_inhibit_v1.c
@@ -67,6 +67,7 @@ struct sway_idle_inhibit_manager_v1 *sway_idle_inhibit_manager_v1_create(
 
         manager->wlr_manager = wlr_idle_inhibit_v1_create(wl_display);
         if (!manager->wlr_manager) {
+                free(manager);
                 return NULL;
         }
         manager->idle = idle;
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c
index 91baa6f8..a7d96717 100644
--- a/sway/desktop/layer_shell.c
+++ b/sway/desktop/layer_shell.c
@@ -325,12 +325,6 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                 layer_surface->client_pending.margin.bottom,
                 layer_surface->client_pending.margin.left);
 
-        struct sway_layer_surface *sway_layer =
-                calloc(1, sizeof(struct sway_layer_surface));
-        if (!sway_layer) {
-                return;
-        }
-
         if (!layer_surface->output) {
                 // Assign last active output
                 struct sway_container *output = NULL;
@@ -352,6 +346,12 @@ void handle_layer_shell_surface(struct wl_listener *listener, void *data) {
                 layer_surface->output = output->sway_output->wlr_output;
         }
 
+        struct sway_layer_surface *sway_layer =
+                calloc(1, sizeof(struct sway_layer_surface));
+        if (!sway_layer) {
+                return;
+        }
+
         sway_layer->surface_commit.notify = handle_surface_commit;
         wl_signal_add(&layer_surface->surface->events.commit,
                 &sway_layer->surface_commit);
diff --git a/sway/tree/view.c b/sway/tree/view.c
index 70ab9364..fc31699c 100644
--- a/sway/tree/view.c
+++ b/sway/tree/view.c
@@ -621,16 +621,16 @@ void view_unmap(struct sway_view *view) {
                 view->urgent_timer = NULL;
         }
 
-        struct sway_container *parent;
         struct sway_container *ws = container_parent(view->swayc, C_WORKSPACE);
 
+        struct sway_container *parent;
         if (view->is_fullscreen) {
                 ws->sway_workspace->fullscreen = NULL;
                 parent = container_destroy(view->swayc);
 
                 arrange_windows(ws->parent);
         } else {
-                struct sway_container *parent = container_destroy(view->swayc);
+                parent = container_destroy(view->swayc);
                 arrange_windows(parent);
         }
         if (parent->type >= C_WORKSPACE) { // if the workspace still exists