diff options
author | Drew DeVault <sir@cmpwn.com> | 2019-02-03 09:55:54 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-03 09:55:54 +0100 |
commit | bbfe13a24893bac6a5c41ac39115288d1d6e025f (patch) | |
tree | 1770223ab5d8fb7242452ab7886fdb214ad1aacd /sway | |
parent | Merge pull request #3554 from RedSoxFan/seat-current-alias (diff) | |
parent | Revert "More frees." (diff) | |
download | sway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.tar.gz sway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.tar.zst sway-bbfe13a24893bac6a5c41ac39115288d1d6e025f.zip |
Revert double frees.
Diffstat (limited to 'sway')
-rw-r--r-- | sway/config/bar.c | 1 | ||||
-rw-r--r-- | sway/config/output.c | 1 | ||||
-rw-r--r-- | sway/criteria.c | 7 |
3 files changed, 3 insertions, 6 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) { | |||
46 | free(bar->position); | 46 | free(bar->position); |
47 | free(bar->hidden_state); | 47 | free(bar->hidden_state); |
48 | free(bar->status_command); | 48 | free(bar->status_command); |
49 | free(bar->swaybar_command); | ||
50 | free(bar->font); | 49 | free(bar->font); |
51 | free(bar->separator_symbol); | 50 | free(bar->separator_symbol); |
52 | for (int i = 0; i < bar->bindings->length; i++) { | 51 | 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) { | |||
402 | free(oc->name); | 402 | free(oc->name); |
403 | free(oc->background); | 403 | free(oc->background); |
404 | free(oc->background_option); | 404 | free(oc->background_option); |
405 | free(oc->background_fallback); | ||
406 | free(oc); | 405 | free(oc); |
407 | } | 406 | } |
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) { | |||
35 | } | 35 | } |
36 | 36 | ||
37 | void criteria_destroy(struct criteria *criteria) { | 37 | void criteria_destroy(struct criteria *criteria) { |
38 | free(criteria->raw); | ||
39 | free(criteria->cmdlist); | ||
40 | free(criteria->target); | ||
41 | pcre_free(criteria->title); | 38 | pcre_free(criteria->title); |
42 | pcre_free(criteria->shell); | 39 | pcre_free(criteria->shell); |
43 | pcre_free(criteria->app_id); | 40 | pcre_free(criteria->app_id); |
44 | pcre_free(criteria->con_mark); | ||
45 | #if HAVE_XWAYLAND | 41 | #if HAVE_XWAYLAND |
46 | pcre_free(criteria->class); | 42 | pcre_free(criteria->class); |
47 | pcre_free(criteria->instance); | 43 | pcre_free(criteria->instance); |
48 | pcre_free(criteria->window_role); | 44 | pcre_free(criteria->window_role); |
49 | #endif | 45 | #endif |
46 | pcre_free(criteria->con_mark); | ||
50 | free(criteria->workspace); | 47 | free(criteria->workspace); |
48 | free(criteria->cmdlist); | ||
49 | free(criteria->raw); | ||
51 | free(criteria); | 50 | free(criteria); |
52 | } | 51 | } |
53 | 52 | ||