Merge pull request #3551 from c-edw/RevertDoubleFrees1.0-rc1

Revert double frees.

5 files changed, 3 insertions, 9 deletions

diff --git a/sway/config/bar.c b/sway/config/bar.c
index 2e28fa1e..bafef307 100644
--- a/sway/config/bar.c
+++ b/sway/config/bar.c
@@ -46,7 +46,6 @@ void free_bar_config(struct bar_config *bar) {
         free(bar->position);
         free(bar->hidden_state);
         free(bar->status_command);
-        free(bar->swaybar_command);
         free(bar->font);
         free(bar->separator_symbol);
         for (int i = 0; i < bar->bindings->length; i++) {
diff --git a/sway/config/output.c b/sway/config/output.c
index cc5f29db..970764b0 100644
--- a/sway/config/output.c
+++ b/sway/config/output.c
@@ -402,6 +402,5 @@ void free_output_config(struct output_config *oc) {
         free(oc->name);
         free(oc->background);
         free(oc->background_option);
-        free(oc->background_fallback);
         free(oc);
 }
diff --git a/sway/criteria.c b/sway/criteria.c
index 59a923f9..48ef39df 100644
--- a/sway/criteria.c
+++ b/sway/criteria.c
@@ -35,19 +35,18 @@ bool criteria_is_empty(struct criteria *criteria) {
 }
 
 void criteria_destroy(struct criteria *criteria) {
-        free(criteria->raw);
-        free(criteria->cmdlist);
-        free(criteria->target);
         pcre_free(criteria->title);
         pcre_free(criteria->shell);
         pcre_free(criteria->app_id);
-        pcre_free(criteria->con_mark);
 #if HAVE_XWAYLAND
         pcre_free(criteria->class);
         pcre_free(criteria->instance);
         pcre_free(criteria->window_role);
 #endif
+        pcre_free(criteria->con_mark);
         free(criteria->workspace);
+        free(criteria->cmdlist);
+        free(criteria->raw);
         free(criteria);
 }
 
diff --git a/swaybar/config.c b/swaybar/config.c
index b94fcfee..6e36573c 100644
--- a/swaybar/config.c
+++ b/swaybar/config.c
@@ -108,7 +108,6 @@ void free_config(struct swaybar_config *config) {
         free(config->mode);
         free(config->hidden_state);
         free(config->sep_symbol);
-        free(config->modifier);
         for (int i = 0; i < config->bindings->length; i++) {
                 struct swaybar_binding *binding = config->bindings->items[i];
                 free_binding(binding);
diff --git a/swaybar/status_line.c b/swaybar/status_line.c
index 17ada40c..342f981e 100644
--- a/swaybar/status_line.c
+++ b/swaybar/status_line.c
@@ -182,8 +182,6 @@ void status_line_free(struct status_line *status) {
                 }
                 json_tokener_free(status->tokener);
         }
-        free(status->read);
-        free(status->write);
         free(status->buffer);
         free(status);
 }